More xrick-related cleanups

* Correct broken CREDITS file causing HTML manual build failures
 * Fix warning on iAudio M3 and MPIO HD200
 * Fix XRGB888 pixelformat builds, hopefully correctly.

This should bring the board back to green.

Change-Id: Ia7d54641d37db19d4cee3b5d9f5d8ab1567ac30b

apps/plugins/xrick/system/sysvid_rockbox.c

@@ -123,7 +123,12 @@ void sysvid_setPalette(img_color_t *pal, U16 n)
     for (i = 0; i < n; i++)
     {
 #ifdef HAVE_LCD_COLOR
+#if LCD_PIXELFORMAT == XRGB8888
+        int x =  LCD_RGBPACK(pal[i].r, pal[i].g, pal[i].b);
+        palette[i] = FB_SCALARPACK(x);
+#else
         palette[i] = LCD_RGBPACK(pal[i].r, pal[i].g, pal[i].b);
+#endif
 #else
         palette[i] = ((3 * pal[i].r) + (6 * pal[i].g) + pal[i].b) / 10;
 #endif
@@ -212,7 +217,7 @@ void sysvid_update(const rect_t *rects)
         }
         destBuf = lcd_fb;
 #else
-        destBuf = greybuffer;
+        destBuf = (fb_data*) greybuffer;
 #endif /* HAVE_LCD_COLOR */
         destBuf += resizedColumn + resizedRow * LCD_WIDTH;
 

docs/CREDITS

@@ -8,7 +8,7 @@
 
 People that have contributed to the project, one way or another. Friends!
 
-Björn Stenberg
+Björn Stenberg
 Linus Nielsen Feltzing
 Andy Choi
 Andrew Jamieson
@@ -20,17 +20,17 @@ Gary Czvitkovicz
 Stuart Martin
 Felix Arends
 Ulf Ralberg
-David Härdeman
+David Härdeman
 Thomas Saeys
 Grant Wier
-Julien Labruyére
+Julien Labruyére
 Nicolas Sauzede
 Robert Hak
 Dave Chapman
 Stefan Meyer
 Eric Linenberg
 Tom Cvitan
-Magnus Öman
+Magnus Öman
 Jerome Kuptz
 Julien Boissinot
 Nuutti Kotivuori
@@ -59,14 +59,14 @@ Kjell Ericson
 Jim Hagani
 Ludovic Lange
 Mike Holden
-Simon Elén
+Simon Elén
 Matthew P. O'Reilly
-Christian Schönberger
+Christian Schönberger
 Henrik Backe
 Craig Sather
-José Maria Garcia-Valdecasas Bernal
+José Maria Garcia-Valdecasas Bernal
 Stevie Oh
-Jörg Hohensohn
+Jörg Hohensohn
 Dave Jones
 Thomas Paul Diffenbach
 Roland Kletzing
@@ -96,7 +96,7 @@ Jiri Jurecek
 Jacob Erlbeck
 Jean-Philippe Bernardy
 Dave Hooper
-Jonas Häggqvist
+Jonas Häggqvist
 Thom Johansen
 Rinat Zakirov
 Manuel Dejonghe
@@ -105,12 +105,12 @@ Michiel van der Kolk
 Tony Motakis
 Andy Young
 Alexandre Bourget
-Richard S. La Charité III
+Richard S. La Charité III
 Christian Gmeiner
 Tomas Salfischberger
 Miika Pekkarinen
 Tapio Karppinen
-Richard Ottó O'Brien
+Richard Ottó O'Brien
 Luca Burelli
 Alessio Lenzi
 David Bryant
@@ -126,9 +126,9 @@ Hristo Kovachev
 Sander Sweers
 Antonius Hellman
 Ryan Jackson
-Per Holmäng
+Per Holmäng
 Frederic Devernay
-José M. Fandiño
+José M. Fandiño
 Gadi Cohen
 Naftali Goldstein
 David Dent
@@ -171,19 +171,19 @@ Mikael Magnusson
 Dominik Wenger
 Henrico Witvliet
 Andrew Scott
-Miguel A. Arévalo
+Miguel A. Arévalo
 Aaron F. Gonzalez
 Aleksey Kozyulin
 Jani Kinnunen
 Rui Marinho
 Alun Thomas
-Nils Wallménius
+Nils Wallménius
 Naoaki Okazaki
 Will Dyson
 Matthias Mohr
 Christian Marg
 Eli Sherer
-Fredrik Öhrn
+Fredrik Öhrn
 Nicolas Pennequin
 Ralf Herz
 Michael DiFebbo
@@ -204,18 +204,18 @@ Frederik Vestre
 Wenbin Leo
 Tom Evans
 Ewan Davies
-Frédéric François
+Frédéric François
-Marc-André Moreau
+Marc-André Moreau
 Ioannis Koutoulakis
 Alistair Marshall
 Karl Ove Hufthammer
-Víctor Zabalza
+Víctor Zabalza
 Ulrich Pegelow
 Andreas Mattsson
 Daniel Ankers
 Paul Louden
 Rainer Sinsch
-Plácido Revilla
+Plácido Revilla
 Michael Sevakis
 Lukas Sabota
 Emanuel Zephir
@@ -243,13 +243,13 @@ Robert Kukla
 David Quesada
 Jared Stafford
 Martin Hensel
-Stéphane Doyon
+Stéphane Doyon
 Austin Appel
 Andre Smith
 Travis Hyyppa
 Ian Webber
 Pavel Gnelitsa
-Lutz Böhne
+Lutz Böhne
 Will Robertson
 Robert Carboneau
 Ye Wei
@@ -259,13 +259,13 @@ Chris Taylor
 Tobias Langhoff
 Steve Gotthardt
 Greg White
-Mattieu Favréaux
+Mattieu Favréaux
 Malcolm Tyrrell
 Piotr Jafiszow
 Gary Allen
 John BouAntoun
 Tomasz Mon
-Jakub Matou?ek
+Jakub Matoušek
 Albert Veli
 Chris Dohan
 Takashi Obara
@@ -276,7 +276,7 @@ Sean Morrisey
 Shay Green
 Nick Vanderweit
 Simon Menzel
-Timo Horstschäfer
+Timo Horstschäfer
 Jacco Koning
 Chris Ham
 Jose Ramon Garcia
@@ -335,7 +335,7 @@ Alexander Eickhoff
 Ken Fazzone
 David Bishop
 Hein-Pieter van Braam
-Przemys?aw Ho?ubowski
+Przemysław Hołubowski
 Stepan Moskovchenko
 John S. Gwynne
 Brian J. Morey
@@ -343,12 +343,12 @@ Stijn Hisken
 Bertrik Sikken
 Karim Boucher
 James Espinoza
-Franz Rühmland
+Franz Rühmland
 Jordan Anderson
 Maurus Cuelenaere
 Chris Allegretta
 Alastair S
-Martin Crkovský
+Martin Crkovský
 Ariya Hidayat
 Jonas Hurrelmann
 Lee Kang Hyuk
@@ -356,7 +356,7 @@ Clemens Werther
 Robert Menes
 Henri Valta
 Melba Sitjar
-Mehmet ?. Çatalba?
+Mehmet Ş. Çatalbaş
 Scott Tinman
 Alexander Kuzmenkov
 Thomas Martitz
@@ -366,7 +366,7 @@ Apoorva Mahajan
 Vuong Minh Hiep
 Mateusz Kubica
 Frank Gevaerts
-Chelo Sacristán
+Chelo Sacristán
 Sascha Wolf
 Nickolay Jordanov
 Johannes Voggenthaler
@@ -380,7 +380,7 @@ Ivan Pesic
 Marcel Barbulescu
 Phil Light
 Rob Purchase
-Andreas Müller
+Andreas Müller
 Christopher Williams
 Martin Ritter
 Justin Hannigan
@@ -409,39 +409,39 @@ Shunsuke Shimizu
 Tadayuki Nishizono
 Jun Gu
 Daniel Weck
-Clément Pit-Claudel
+Clément Pit-Claudel
 Jelle Geerts
-Tadeusz Py?
+Tadeusz Pyś
 Rostislav Chekan
 Florin Popescu
 Volker Mische
 Vitja Makarov
 Francisco Vila
 Christian Lees
-Rafaël Carré
+Rafaël Carré
 Denes Balatoni
 Roy Wallace
 Eric Lassauge
-François Dinel
+François Dinel
 Francesco Rigoni
-Joël Puik
+Joël Puik
 Klaas Bosteels
 Teruaki Kawashima
-Marcin ?ukasik
+Marcin Łukasik
 Le Jin
 Alex Bennee
-Stéphane Quertinmont
+Stéphane Quertinmont
 Bartosz Fabianowski
 Adam Hogan
 Andrew Mahone
 Anton Veretenenko
 Vicente Ibarra
-Rui Araújo
+Rui Araújo
 Brian Cloutier
 Olivier Barbut
 Yoshihisa Uchida
 Sanggon Lee
-Kaspar Rothenfußer
+Kaspar Rothenfußer
 Ryan Press
 Craig Elliott
 Kenderes Tamas
@@ -453,7 +453,7 @@ Gareth Schakel
 Brian Sutherland
 Sam Bouwer
 Johannes Linke
-Michaël Burtin
+Michaël Burtin
 Sasha Khamkov
 Kai Posadowsky
 Jack Halpin
@@ -504,14 +504,14 @@ Yann Muller
 Sascha Wilde
 Fred Bauer
 Simon Rothen
-Pavel Rzehák
+Pavel Rzehák
 Diego Herranz
 Viktor Varga
 Juliusz Chroboczek
 Christian Beier
 Giovanni Zilli
 Shiloh Hawley
-Peter Lecký
+Peter Lecký
 Wilfred Hughes
 Laurent Gautier
 Simon Zhukovsky
@@ -528,36 +528,36 @@ Mark Borgerding
 Tobias Diedrich
 Andrew Engelbrecht
 Kevin Schoedel
-Jens Theeß
+Jens Theeß
 Alexey Nemtsev
 Pascal Below
 Danny Attar
 Philipp Stephani
-Tore Johnny Bråtveit
+Tore Johnny Bråtveit
 Marcin Bukat
 Andrew Rodland
 Luca Leonardo Scorcia
 Gerhard Zintel
-Adrián Cereto Massagué
+Adrián Cereto Massagué
 Chris Savery
-Raphaël Jakse
+Raphaël Jakse
 Wincent Balin
 Aaron Rothbaum
 Nejc Lotric
-Hinrik Örn Sigurðsson
+Hinrik Örn Sigurðsson
 Stephen Carroll
 Joe Balough
-Jérôme Heil
+Jérôme Heil
 Tim Graf
-Martin Sägmüller
+Martin Sägmüller
 Joshua Hulst
 Pierre-Yves Roosens
 Hayden Pearce
 Rodrigo Barretto
 Daniel Rigby
 Alexey Polkhirev
-István Nagy
+István Nagy
-Wojciech Le?niak
+Wojciech Leśniak
 Tuomas Airaksinen
 Calvin Walden
 Michael Gentry
@@ -572,12 +572,12 @@ Craig Mann
 William Peters
 Li Jie
 Cristina Talpiga
-?tefan Moisei
+Ştefan Moisei
 Alexander Meshcheryakov
 Ryan Sawhill
 Thomas Jarosch
 Will Sowerbutts
-?ukasz Stelmach
+Łukasz Stelmach
 Gabriel Maia
 Robert Horn
 Ante Maretic
@@ -586,12 +586,12 @@ Uwe Wiebach
 Mikhail Titov
 Dave Slusher
 Jean-Marie Moraux
-Ismael Castiñeira Álvarez
+Ismael Castiñeira Álvarez
-M?rti?? ?imis
+Mārtiņš Šimis
 Huan Zhang
 Leif Andersen
 Sergiu Rotaru
-Noé Lojkine
+Noé Lojkine
 Ophir Lojkine
 Stephan Grossklass
 John Morris
@@ -616,7 +616,7 @@ Artur Juraszek
 Wieland Hoffmann
 Nathan Korth
 Igor Petelin
-Cástor Muñoz
+Cástor Muñoz
 Albert Barca
 Fukuda Takafumi
 Dimitar Dimitrov
@@ -649,8 +649,8 @@ Semyon Zhukovsky
 Kostadin Kolev
 Jordi Prenafeta
 Tiago Medeiros
-Udo Schläpfer
+Udo Schläpfer
-Åka Sikrom
+Åka Sikrom
 Thomas White
 Karl Huber
 Adam Sampson
@@ -685,16 +685,15 @@ Martin Buck
 Stefan Ott
 David Chionne
 Wilfried Winkler
-Johannes König
+Johannes König
 Alexander Drammen
 Kei Miyamoto
 James D. Smith
 Howard Richardson
-Aurélien Coudurier
 Sylvain Saubier
 Adrián Tinoco
 Boris Kovačević
-Stéphane Moutard-Martin
+Stéphane Moutard-Martin
 Rune Pade
 Michael Rey
 Yuxuan Shui
@@ -763,4 +762,4 @@ The bsdiff team
 The libtomcrypt team
 The microtar team (rxi and others)
 The UnifontEX and GNU Unifont teams
-The XRick team
+The xrick team

manual/plugins/xrick.tex

@@ -1,7 +1,7 @@
 \subsection{xrick}
 \screenshot{plugins/images/ss-xrick}{xrick}{img:xrick}
-xrick is a clone of the platform game
+
-\emph{'Rick Dangerous'}
+Xrick is a clone of the platform game \emph{'Rick Dangerous'}
 (\url{http://en.wikipedia.org/wiki/Rick_Dangerous}),
 originally written by 'BigOrno'
 (\url{http://www.bigorno.net/xrick/}),
@@ -18,13 +18,7 @@ sometimes a dynamite stick or a bullet is needed.
 Go figure.
 
 \subsubsection{Getting started}
-For the game to run you need \fname{.dat} game files located in
+For the game to run you need the data files at \url{https://download.rockbox.org/useful/xrick-data.zip}.  Extract the \fname{xrick-data.zip} archive into the top-level directory of your \dap.
-\fname{/.rockbox/xrick} on your \dap.
-
-The needed files can be found at
-\url{https://download.rockbox.org/useful/xrick-data.zip}.
-
-Extract the \fname{xrick-data.zip} archive into the top-level directory of your \dap.
 
 \subsubsection{Controls}
 By holding down \emph{Fire} and pressing \emph{Left} or \emph{Right},