From eacb4daa2d3b06056310dae1b3e03d7dfd406adb Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Sun, 30 Jun 2024 20:23:14 -0400 Subject: 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 | 7 +- docs/CREDITS | 127 ++++++++++++++--------------- manual/plugins/xrick.tex | 12 +-- 3 files changed, 72 insertions(+), 74 deletions(-) diff --git a/apps/plugins/xrick/system/sysvid_rockbox.c b/apps/plugins/xrick/system/sysvid_rockbox.c index fccf515575..697bf2fd06 100644 --- a/apps/plugins/xrick/system/sysvid_rockbox.c +++ b/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; diff --git a/docs/CREDITS b/docs/CREDITS index 2fd7b35537..362bb0bde7 100644 --- a/docs/CREDITS +++ b/docs/CREDITS @@ -8,7 +8,7 @@ People that have contributed to the project, one way or another. Friends! -Bjrn Stenberg +Björn Stenberg Linus Nielsen Feltzing Andy Choi Andrew Jamieson @@ -20,17 +20,17 @@ Gary Czvitkovicz Stuart Martin Felix Arends Ulf Ralberg -David Hrdeman +David Härdeman Thomas Saeys Grant Wier -Julien Labruyre +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 Eln +Simon Elén Matthew P. O'Reilly -Christian Schnberger +Christian Schönberger Henrik Backe Craig Sather -Jos Maria Garcia-Valdecasas Bernal +José Maria Garcia-Valdecasas Bernal Stevie Oh -Jrg 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 Hggqvist +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 Holmng +Per Holmäng Frederic Devernay -Jos M. Fandio +José M. Fandiño Gadi Cohen Naftali Goldstein David Dent @@ -171,19 +171,19 @@ Mikael Magnusson Dominik Wenger Henrico Witvliet Andrew Scott -Miguel A. Arvalo +Miguel A. Arévalo Aaron F. Gonzalez Aleksey Kozyulin Jani Kinnunen Rui Marinho Alun Thomas -Nils Wallmnius +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 -Frdric Franois -Marc-Andr Moreau +Frédéric François +Marc-André Moreau Ioannis Koutoulakis Alistair Marshall Karl Ove Hufthammer -Vctor Zabalza +Víctor Zabalza Ulrich Pegelow Andreas Mattsson Daniel Ankers Paul Louden Rainer Sinsch -Plcido Revilla +Plácido Revilla Michael Sevakis Lukas Sabota Emanuel Zephir @@ -243,13 +243,13 @@ Robert Kukla David Quesada Jared Stafford Martin Hensel -Stphane Doyon +Stéphane Doyon Austin Appel Andre Smith Travis Hyyppa Ian Webber Pavel Gnelitsa -Lutz Bhne +Lutz Böhne Will Robertson Robert Carboneau Ye Wei @@ -259,13 +259,13 @@ Chris Taylor Tobias Langhoff Steve Gotthardt Greg White -Mattieu Favraux +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 Horstschfer +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 Rhmland +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 Sacristn +Chelo Sacristán Sascha Wolf Nickolay Jordanov Johannes Voggenthaler @@ -380,7 +380,7 @@ Ivan Pesic Marcel Barbulescu Phil Light Rob Purchase -Andreas Mller +Andreas Müller Christopher Williams Martin Ritter Justin Hannigan @@ -409,39 +409,39 @@ Shunsuke Shimizu Tadayuki Nishizono Jun Gu Daniel Weck -Clment Pit-Claudel +Clément Pit-Claudel Jelle Geerts -Tadeusz Py? +Tadeusz Pyś Rostislav Chekan Florin Popescu Volker Mische Vitja Makarov Francisco Vila Christian Lees -Rafal Carr +Rafaël Carré Denes Balatoni Roy Wallace Eric Lassauge -Franois Dinel +François Dinel Francesco Rigoni -Jol Puik +Joël Puik Klaas Bosteels Teruaki Kawashima -Marcin ?ukasik +Marcin Łukasik Le Jin Alex Bennee -Stphane Quertinmont +Stéphane Quertinmont Bartosz Fabianowski Adam Hogan Andrew Mahone Anton Veretenenko Vicente Ibarra -Rui Arajo +Rui Araújo Brian Cloutier Olivier Barbut Yoshihisa Uchida Sanggon Lee -Kaspar Rothenfuer +Kaspar Rothenfußer Ryan Press Craig Elliott Kenderes Tamas @@ -453,7 +453,7 @@ Gareth Schakel Brian Sutherland Sam Bouwer Johannes Linke -Michal Burtin +Michaël Burtin Sasha Khamkov Kai Posadowsky Jack Halpin @@ -504,14 +504,14 @@ Yann Muller Sascha Wilde Fred Bauer Simon Rothen -Pavel Rzehk +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 Brtveit +Tore Johnny Bråtveit Marcin Bukat Andrew Rodland Luca Leonardo Scorcia Gerhard Zintel -Adrin Cereto Massagu +Adrián Cereto Massagué Chris Savery -Raphal Jakse +Raphaël Jakse Wincent Balin Aaron Rothbaum Nejc Lotric -Hinrik rn Sigursson +Hinrik Örn Sigurðsson Stephen Carroll Joe Balough -Jrme Heil +Jérôme Heil Tim Graf -Martin Sgmller +Martin Sägmüller Joshua Hulst Pierre-Yves Roosens Hayden Pearce Rodrigo Barretto Daniel Rigby Alexey Polkhirev -Istvn Nagy -Wojciech Le?niak +István Nagy +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 Castieira lvarez -M?rti?? ?imis +Ismael Castiñeira Álvarez +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 -Cstor Muoz +Cástor Muñoz Albert Barca Fukuda Takafumi Dimitar Dimitrov @@ -649,8 +649,8 @@ Semyon Zhukovsky Kostadin Kolev Jordi Prenafeta Tiago Medeiros -Udo Schlpfer -ka Sikrom +Udo Schläpfer +Åka Sikrom Thomas White Karl Huber Adam Sampson @@ -685,16 +685,15 @@ Martin Buck Stefan Ott David Chionne Wilfried Winkler -Johannes Knig +Johannes König Alexander Drammen Kei Miyamoto James D. Smith Howard Richardson -Aurlien Coudurier Sylvain Saubier Adrián Tinoco Boris Kovačević -Stphane 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 diff --git a/manual/plugins/xrick.tex b/manual/plugins/xrick.tex index 435651df3b..9f64349517 100755 --- a/manual/plugins/xrick.tex +++ b/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 -\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. +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. \subsubsection{Controls} By holding down \emph{Fire} and pressing \emph{Left} or \emph{Right}, -- cgit v1.2.3