From 99771f893d20c5061f5d358bef7d9e5ffb702c18e066fbc7ca69cbdf64803f18 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 6 Apr 2015 20:42:15 +0000 Subject: [PATCH] blockout-2.5 OBS-URL: https://build.opensuse.org/package/show/games/blockout?expand=0&rev=10 --- automake.diff | 37 +++--- bl24-src-linux-i586.tar.xz | 3 - bl25-linux-x86.tar.gz | 3 + bl25-src.tar.gz | 3 + bl2home.diff | 30 ++--- blockout.changes | 8 ++ blockout.spec | 20 +-- compilefixes.diff | 248 ++++++++++++++++++------------------- 8 files changed, 178 insertions(+), 174 deletions(-) delete mode 100644 bl24-src-linux-i586.tar.xz create mode 100644 bl25-linux-x86.tar.gz create mode 100644 bl25-src.tar.gz diff --git a/automake.diff b/automake.diff index 78fe8ef..83601ee 100644 --- a/automake.diff +++ b/automake.diff @@ -2,18 +2,18 @@ From: Jan Engelhardt Date: 2012-03-25 16:12:52.925160061 +0200 --- - BlockOut/Makefile.am | 14 ++++++++++++++ + BlockOut/Makefile.am | 11 +++++++++++ ImageLib/src/Makefile.am | 12 ++++++++++++ ImageLib/src/png/hpng.c | 2 +- Makefile.am | 3 +++ - configure.ac | 14 ++++++++++++++ - 5 files changed, 44 insertions(+), 1 deletion(-) + configure.ac | 12 ++++++++++++ + 5 files changed, 39 insertions(+), 1 deletion(-) -Index: bl24_lin_src/BlockOut/Makefile.am +Index: BL_SRC/BlockOut/Makefile.am =================================================================== --- /dev/null -+++ bl24_lin_src/BlockOut/Makefile.am -@@ -0,0 +1,14 @@ ++++ BL_SRC/BlockOut/Makefile.am +@@ -0,0 +1,11 @@ +# -*- Makefile -*- + +AM_CPPFLAGS = -D_DEBUG -Dlinux -I../ImageLib/src -I. \ @@ -21,17 +21,14 @@ Index: bl24_lin_src/BlockOut/Makefile.am + +bin_PROGRAMS = blockout +blockout_SOURCES = \ -+ BlockOut.cpp BotPlayer.cpp EditControl.cpp Game.cpp Http.cpp InitPolyCube.cpp Menu.cpp MenuGraphics.cpp MenuGrid.cpp PageChangeSetup.cpp PageChooseSetup.cpp PageControls.cpp PageCredits.cpp PageGSOptions.cpp PageHallOfFame.cpp PageHallOfFameOnLine.cpp PageHttp.cpp PageMainMenu.cpp PageOptions.cpp PageScoreDetails.cpp PageStartGame.cpp Pit.cpp PolyCube.cpp SetupManager.cpp SoundManager.cpp Sprites.cpp Utils.cpp BlockOut.h BotPlayer.h EditControl.h Game.h Http.h Menu.h MenuGrid.h MenuPage.h Pit.h PolyCube.h SetupManager.h SoundManager.h Sprites.h Types.h GLApp/GLApp.cpp GLApp/GLFont.cpp GLApp/GLMatrix.cpp GLApp/GLSprite.cpp GLApp/GLApp.h GLApp/GLFont.h GLApp/GLMatrix.h GLApp/GLSprite.h ++ BlockOrientation.h BlockOut.cpp BlockOut.h BotMatrix.cpp BotMatrix.h BotPlayer.cpp BotPlayer.h BotPlayerAI.cpp EditControl.cpp EditControl.h GLApp/GLApp.cpp GLApp/GLApp.h GLApp/GLFont.cpp GLApp/GLFont.h GLApp/GLMatrix.cpp GLApp/GLMatrix.h GLApp/GLSprite.cpp GLApp/GLSprite.h Game.cpp Game.h Http.cpp Http.h InitPolyCube.cpp Menu.cpp Menu.h MenuGraphics.cpp MenuGrid.cpp MenuGrid.h MenuPage.h PageChangeSetup.cpp PageChooseSetup.cpp PageControls.cpp PageCredits.cpp PageGSOptions.cpp PageHallOfFame.cpp PageHallOfFameOnLine.cpp PageHttp.cpp PageMainMenu.cpp PageOptions.cpp PageScoreDetails.cpp PageStartGame.cpp Pit.cpp Pit.h PolyCube.cpp PolyCube.h SetupManager.cpp SetupManager.h SoundManager.cpp SoundManager.h Sprites.cpp Sprites.h Types.h Utils.cpp +blockout_LDADD = \ + ../ImageLib/src/libimagelib.la \ + ${libGL_LIBS} ${libGLU_LIBS} ${libSDL_LIBS} ${libSDL_mixer_LIBS} -+ -+nobase_pkgdata_DATA = \ -+ images/allPieces.png images/background.png images/background2.png images/background3.png images/font.png images/gameover.png images/gameovera.png images/marble.png images/marbleg.png images/menuback.png images/menucredits.png images/menufont.png images/menufont2.png images/menupit.png images/online.png images/onlinea.png images/spark.png images/sparka.png images/sprites.png images/spritesa.png images/star_crystal_grid.png sounds/blub.wav sounds/empty.wav sounds/empty2.wav sounds/hit.wav sounds/level.wav sounds/level2.wav sounds/line.wav sounds/line2.wav sounds/music.mp3 sounds/tchh.wav sounds/welldone.wav sounds/welldone2.wav sounds/wozz.wav -Index: bl24_lin_src/ImageLib/src/Makefile.am +Index: BL_SRC/ImageLib/src/Makefile.am =================================================================== --- /dev/null -+++ bl24_lin_src/ImageLib/src/Makefile.am ++++ BL_SRC/ImageLib/src/Makefile.am @@ -0,0 +1,12 @@ +# -*- Makefile -*- + @@ -40,15 +37,15 @@ Index: bl24_lin_src/ImageLib/src/Makefile.am +noinst_LTLIBRARIES = libimagelib.la + +libimagelib_la_SOURCES = \ -+ gif/gif.c gif/gif.h \ ++ gif/gif.cpp gif/gif.h \ + jpg/H2v2.cpp jpg/idct.cpp jpg/jpegdecoder.cpp jpg/jpegdecodermain.cpp jpg/jpegdecoder.h jpg/main.h \ + png/hpng.c png/hpng.h \ + CImage.cpp CImage.h +libimagelib_la_LIBADD = ${libpng_LIBS} -Index: bl24_lin_src/ImageLib/src/png/hpng.c +Index: BL_SRC/ImageLib/src/png/hpng.c =================================================================== ---- bl24_lin_src.orig/ImageLib/src/png/hpng.c -+++ bl24_lin_src/ImageLib/src/png/hpng.c +--- BL_SRC.orig/ImageLib/src/png/hpng.c ++++ BL_SRC/ImageLib/src/png/hpng.c @@ -1,6 +1,6 @@ #include #include @@ -57,18 +54,18 @@ Index: bl24_lin_src/ImageLib/src/png/hpng.c #include "hpng.h" char PngErrorMessage[1024]; -Index: bl24_lin_src/Makefile.am +Index: BL_SRC/Makefile.am =================================================================== --- /dev/null -+++ bl24_lin_src/Makefile.am ++++ BL_SRC/Makefile.am @@ -0,0 +1,3 @@ +# -*- Makefile -*- + +SUBDIRS = ImageLib/src BlockOut -Index: bl24_lin_src/configure.ac +Index: BL_SRC/configure.ac =================================================================== --- /dev/null -+++ bl24_lin_src/configure.ac ++++ BL_SRC/configure.ac @@ -0,0 +1,12 @@ +AC_INIT([blockout], [2.4]) +AC_CONFIG_AUX_DIR([build-aux]) diff --git a/bl24-src-linux-i586.tar.xz b/bl24-src-linux-i586.tar.xz deleted file mode 100644 index a4d4a6c..0000000 --- a/bl24-src-linux-i586.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1633a2f3d53c2ab44bcbaa731c21e84bc6e6e0a2aed80e5110e8a0b28fb24d77 -size 4874736 diff --git a/bl25-linux-x86.tar.gz b/bl25-linux-x86.tar.gz new file mode 100644 index 0000000..45ffa5b --- /dev/null +++ b/bl25-linux-x86.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bf9ab1798e7d3f82a372a3fae26a5c7699d1c57263253dce66f07fa418b702b +size 4379299 diff --git a/bl25-src.tar.gz b/bl25-src.tar.gz new file mode 100644 index 0000000..ca3f005 --- /dev/null +++ b/bl25-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3abf61c4a7bd921988596a2239d76a5800fc94d8fd84dcc82c720d4d4f84cf0f +size 479743 diff --git a/bl2home.diff b/bl2home.diff index 959692b..9215e8e 100644 --- a/bl2home.diff +++ b/bl2home.diff @@ -6,10 +6,10 @@ Date: 2012-03-25 16:17:03.379573514 +0200 BlockOut/Utils.cpp | 2 ++ 2 files changed, 3 insertions(+) -Index: bl24_lin_src/BlockOut/Makefile.am +Index: BL_SRC/BlockOut/Makefile.am =================================================================== ---- bl24_lin_src.orig/BlockOut/Makefile.am -+++ bl24_lin_src/BlockOut/Makefile.am +--- BL_SRC.orig/BlockOut/Makefile.am ++++ BL_SRC/BlockOut/Makefile.am @@ -1,6 +1,7 @@ # -*- Makefile -*- @@ -18,16 +18,16 @@ Index: bl24_lin_src/BlockOut/Makefile.am ${libSDL_CFLAGS} ${libSDL_mixer_CFLAGS} bin_PROGRAMS = blockout -Index: bl24_lin_src/BlockOut/Utils.cpp +Index: BL_SRC/BlockOut/Utils.cpp =================================================================== ---- bl24_lin_src.orig/BlockOut/Utils.cpp -+++ bl24_lin_src/BlockOut/Utils.cpp -@@ -163,6 +163,8 @@ BOOL CheckEnv() { - } - - char *blockoutHome = getenv("BL2_HOME"); -+ if (blockoutHome == NULL) -+ blockoutHome = BL2_HOME; - if( blockoutHome==NULL ) { - printf("BL2_HOME environement variable if not defined !\n"); - printf("Please set the BL2_HOME to the BlockOut II installation directory (ex: BL2_HOME=/usr/local/bl2).\n"); +--- BL_SRC.orig/BlockOut/Utils.cpp ++++ BL_SRC/BlockOut/Utils.cpp +@@ -208,6 +208,8 @@ BOOL CheckEnv() { + } + + char *blockoutHome = getenv("BL2_HOME"); ++ if (blockoutHome == NULL) ++ blockoutHome = BL2_HOME; + if( blockoutHome==NULL ) { + printf("BL2_HOME environement variable if not defined !\n"); + printf("Please set the BL2_HOME to the BlockOut II installation directory (ex: BL2_HOME=/usr/local/bl2).\n"); diff --git a/blockout.changes b/blockout.changes index 3958b26..1b82868 100644 --- a/blockout.changes +++ b/blockout.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 6 19:19:06 UTC 2015 - jengelh@inai.de + +- Update to new upstream release 2.5 +* A few graphics improvements +* Pratice mode improvements +* Improved the demo mode (bot plays better) + ------------------------------------------------------------------- Mon Nov 11 04:27:30 UTC 2013 - jengelh@inai.de diff --git a/blockout.spec b/blockout.spec index 680c60e..e0e81ad 100644 --- a/blockout.spec +++ b/blockout.spec @@ -1,7 +1,7 @@ # # spec file for package blockout # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,15 @@ Name: blockout -Version: 2.4 +Version: 2.5 Release: 0 Summary: A free clone of the original BlockOut DOS game License: GPL-2.0 Group: Amusements/Games/Action/Arcade Url: http://blockout.net/ -#Freecode-URL: https://freecode.com/projects/blockout -Source: bl24-src-linux-i586.tar.xz +Source: http://downloads.sf.net/blockout/bl25-src.tar.gz +Source2: http://downloads.sf.net/blockout/bl25-linux-x86.tar.gz Patch1: automake.diff Patch2: compilefixes.diff Patch3: bl2home.diff @@ -34,7 +34,6 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libtool -BuildRequires: xz BuildRequires: pkgconfig(SDL_mixer) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(sdl) @@ -47,7 +46,8 @@ game has been designed to reproduce the original game kinematics as accurately as possible. %prep -%setup -qn bl24_lin_src +# images, sounds, are in #2. +%setup -qn BL_SRC -a2 %patch -P 1 -P 2 -P 3 -p1 %build @@ -56,11 +56,15 @@ autoreconf -fi make %{?_smp_mflags} %install -make install DESTDIR="%buildroot"; +d="%buildroot/%_datadir/%name" +%make_install +mkdir -p "$d" +mv blockout/{images,sounds} "$d/" +find "$d/" -type f -exec chmod a-x "{}" "+" %files %defattr(-,root,root) %_bindir/blockout -%_datadir/%name +%_datadir/%name/ %changelog diff --git a/compilefixes.diff b/compilefixes.diff index 6153c8f..229c39e 100644 --- a/compilefixes.diff +++ b/compilefixes.diff @@ -2,26 +2,26 @@ From: Jan Engelhardt Date: 2012-03-25 16:06:07.551725021 +0200 --- - BlockOut/EditControl.cpp | 2 +- - BlockOut/EditControl.h | 2 +- - BlockOut/GLApp/GLApp.h | 2 +- - BlockOut/GLApp/GLFont.cpp | 3 +-- - BlockOut/GLApp/GLSprite.cpp | 4 ++-- - BlockOut/GLApp/GLSprite.h | 2 +- - BlockOut/Menu.h | 4 ++-- - BlockOut/MenuGraphics.cpp | 4 ++-- - BlockOut/SetupManager.cpp | 2 +- - BlockOut/SetupManager.h | 2 +- - BlockOut/Types.h | 6 +++--- - BlockOut/Utils.cpp | 6 +++--- - ImageLib/src/jpg/jpegdecoder.cpp | 6 +++--- - ImageLib/src/png/hpng.c | 6 +----- - 14 files changed, 23 insertions(+), 28 deletions(-) + BlockOut/EditControl.cpp | 2 +- + BlockOut/EditControl.h | 2 +- + BlockOut/GLApp/GLApp.h | 2 +- + BlockOut/GLApp/GLFont.cpp | 2 +- + BlockOut/GLApp/GLSprite.cpp | 5 ++--- + BlockOut/GLApp/GLSprite.h | 2 +- + BlockOut/Menu.h | 4 ++-- + BlockOut/MenuGraphics.cpp | 4 ++-- + BlockOut/SetupManager.cpp | 2 +- + BlockOut/SetupManager.h | 2 +- + BlockOut/Types.h | 6 +++--- + BlockOut/Utils.cpp | 6 +++--- + ImageLib/src/jpg/jpegdecodermain.cpp | 4 ++-- + ImageLib/src/png/hpng.c | 7 ++----- + 14 files changed, 23 insertions(+), 27 deletions(-) -Index: bl24_lin_src/BlockOut/EditControl.cpp +Index: BL_SRC/BlockOut/EditControl.cpp =================================================================== ---- bl24_lin_src.orig/BlockOut/EditControl.cpp -+++ bl24_lin_src/BlockOut/EditControl.cpp +--- BL_SRC.orig/BlockOut/EditControl.cpp ++++ BL_SRC/BlockOut/EditControl.cpp @@ -30,7 +30,7 @@ void EditControl::SetDisplayLength(int l // ------------------------------------------------ @@ -31,10 +31,10 @@ Index: bl24_lin_src/BlockOut/EditControl.cpp if( strlen(text)>=255 ) { strncpy(editText,text,255); -Index: bl24_lin_src/BlockOut/EditControl.h +Index: BL_SRC/BlockOut/EditControl.h =================================================================== ---- bl24_lin_src.orig/BlockOut/EditControl.h -+++ bl24_lin_src/BlockOut/EditControl.h +--- BL_SRC.orig/BlockOut/EditControl.h ++++ BL_SRC/BlockOut/EditControl.h @@ -27,7 +27,7 @@ class EditControl { void SetDisplayLength(int length); @@ -44,11 +44,11 @@ Index: bl24_lin_src/BlockOut/EditControl.h // Get the mode BOOL GetMode(); -Index: bl24_lin_src/BlockOut/GLApp/GLApp.h +Index: BL_SRC/BlockOut/GLApp/GLApp.h =================================================================== ---- bl24_lin_src.orig/BlockOut/GLApp/GLApp.h -+++ bl24_lin_src/BlockOut/GLApp/GLApp.h -@@ -57,7 +57,7 @@ protected: +--- BL_SRC.orig/BlockOut/GLApp/GLApp.h ++++ BL_SRC/BlockOut/GLApp/GLApp.h +@@ -60,7 +60,7 @@ protected: // Internal variables for the state of the app BOOL m_bWindowed; @@ -56,36 +56,35 @@ Index: bl24_lin_src/BlockOut/GLApp/GLApp.h + const char *m_strWindowTitle; int m_screenWidth; int m_screenHeight; - -Index: bl24_lin_src/BlockOut/GLApp/GLFont.cpp + BOOL m_bVSync; +Index: BL_SRC/BlockOut/GLApp/GLFont.cpp =================================================================== ---- bl24_lin_src.orig/BlockOut/GLApp/GLFont.cpp -+++ bl24_lin_src/BlockOut/GLApp/GLFont.cpp -@@ -6,8 +6,7 @@ - #include - #include +--- BL_SRC.orig/BlockOut/GLApp/GLFont.cpp ++++ BL_SRC/BlockOut/GLApp/GLFont.cpp +@@ -8,7 +8,7 @@ + #undef LoadImage + #include + +-extern char *LID(char *fileName); ++#include "../Types.h" + + // ------------------------------------------- + +Index: BL_SRC/BlockOut/GLApp/GLSprite.cpp +=================================================================== +--- BL_SRC.orig/BlockOut/GLApp/GLSprite.cpp ++++ BL_SRC/BlockOut/GLApp/GLSprite.cpp +@@ -7,8 +7,7 @@ #include + #undef LoadImage + #include - -extern char *LID(char *fileName); +#include "../Types.h" // ------------------------------------------- -Index: bl24_lin_src/BlockOut/GLApp/GLSprite.cpp -=================================================================== ---- bl24_lin_src.orig/BlockOut/GLApp/GLSprite.cpp -+++ bl24_lin_src/BlockOut/GLApp/GLSprite.cpp -@@ -6,8 +6,8 @@ - #include - #include - #include -+#include "../Types.h" - --extern char *LID(char *fileName); - - // ------------------------------------------- - -@@ -53,7 +53,7 @@ void Sprite2D::UpdateSprite(int x1,int y +@@ -54,7 +53,7 @@ void Sprite2D::UpdateSprite(int x1,int y // ------------------------------------------- @@ -94,24 +93,24 @@ Index: bl24_lin_src/BlockOut/GLApp/GLSprite.cpp GLint bpp; GLenum format; -Index: bl24_lin_src/BlockOut/GLApp/GLSprite.h +Index: BL_SRC/BlockOut/GLApp/GLSprite.h =================================================================== ---- bl24_lin_src.orig/BlockOut/GLApp/GLSprite.h -+++ bl24_lin_src/BlockOut/GLApp/GLSprite.h +--- BL_SRC.orig/BlockOut/GLApp/GLSprite.h ++++ BL_SRC/BlockOut/GLApp/GLSprite.h @@ -15,7 +15,7 @@ public: - // Initialise the font + // Initialise the sprite // return 1 when success, 0 otherwise - int RestoreDeviceObjects(char *diffName,char *alphaName,int srcWidth,int scrHeight); + int RestoreDeviceObjects(const char *diffName, const char *alphaName,int srcWidth,int scrHeight); // Update sprite mapping and coordinates void UpdateSprite(int x1,int y1,int x2,int y2); -Index: bl24_lin_src/BlockOut/Menu.h +Index: BL_SRC/BlockOut/Menu.h =================================================================== ---- bl24_lin_src.orig/BlockOut/Menu.h -+++ bl24_lin_src/BlockOut/Menu.h -@@ -60,8 +60,8 @@ class Menu { +--- BL_SRC.orig/BlockOut/Menu.h ++++ BL_SRC/BlockOut/Menu.h +@@ -61,8 +61,8 @@ class Menu { // Menu page void ToPage(MenuPage *page); void ToPage(MenuPage *page,int iParam,void *wParam); @@ -122,10 +121,10 @@ Index: bl24_lin_src/BlockOut/Menu.h PageMainMenu mainMenuPage; PageStartGame startGamePage; -Index: bl24_lin_src/BlockOut/MenuGraphics.cpp +Index: BL_SRC/BlockOut/MenuGraphics.cpp =================================================================== ---- bl24_lin_src.orig/BlockOut/MenuGraphics.cpp -+++ bl24_lin_src/BlockOut/MenuGraphics.cpp +--- BL_SRC.orig/BlockOut/MenuGraphics.cpp ++++ BL_SRC/BlockOut/MenuGraphics.cpp @@ -438,7 +438,7 @@ void Menu::RenderChar(int x,int y,int w, // --------------------------------------------------------------------- @@ -133,7 +132,7 @@ Index: bl24_lin_src/BlockOut/MenuGraphics.cpp -void Menu::RenderTitle(char *title) { +void Menu::RenderTitle(const char *title) { - int lgth = strlen(title); + int lgth = (int)strlen(title); int nwFont = fround((float)wFont*1.1f); @@ -454,7 +454,7 @@ void Menu::RenderTitle(char *title) { @@ -144,44 +143,46 @@ Index: bl24_lin_src/BlockOut/MenuGraphics.cpp float startLine = 0.515f; float startColumn = 0.15f; -Index: bl24_lin_src/BlockOut/SetupManager.cpp +Index: BL_SRC/BlockOut/SetupManager.cpp =================================================================== ---- bl24_lin_src.orig/BlockOut/SetupManager.cpp -+++ bl24_lin_src/BlockOut/SetupManager.cpp -@@ -363,7 +363,7 @@ int SetupManager::GetTimeout() { - - // ------------------------------------------------ - --char *SetupManager::GetName() { -+const char *SetupManager::GetName() { - - static char ret[32]; - strcpy(ret,""); -Index: bl24_lin_src/BlockOut/SetupManager.h +--- BL_SRC.orig/BlockOut/SetupManager.cpp ++++ BL_SRC/BlockOut/SetupManager.cpp +@@ -364,7 +364,7 @@ int SetupManager::GetTimeout() { + + // ------------------------------------------------ + +-char *SetupManager::GetName() { ++const char *SetupManager::GetName() { + + static char ret[32]; + strcpy(ret,""); +Index: BL_SRC/BlockOut/SetupManager.h =================================================================== ---- bl24_lin_src.orig/BlockOut/SetupManager.h -+++ bl24_lin_src/BlockOut/SetupManager.h -@@ -49,7 +49,7 @@ class SetupManager { - float GetAnimationTime(); /* in seconds */ - - // Names -- char *GetName(); -+ const char *GetName(); - const char *GetBlockSetName(); - - // Sound -Index: bl24_lin_src/BlockOut/Types.h +--- BL_SRC.orig/BlockOut/SetupManager.h ++++ BL_SRC/BlockOut/SetupManager.h +@@ -67,7 +67,7 @@ class SetupManager { + float GetAnimationTime(); /* in seconds */ + + // Names +- char *GetName(); ++ const char *GetName(); + const char *GetBlockSetName(); + + // Sound +Index: BL_SRC/BlockOut/Types.h =================================================================== ---- bl24_lin_src.orig/BlockOut/Types.h -+++ bl24_lin_src/BlockOut/Types.h -@@ -160,13 +160,13 @@ extern int fround(float x); +--- BL_SRC.orig/BlockOut/Types.h ++++ BL_SRC/BlockOut/Types.h +@@ -203,15 +203,15 @@ extern int fround(float x); extern char *FormatTime(float seconds); - extern char *FormatDate(int time); - extern char *FormatDateShort(int time); + extern char *FormatDate(uint32 time); + extern char *FormatDateShort(uint32 time); -extern int CreateTexture(int width,int height,char *imgName,GLuint *hmap); -+extern int CreateTexture(int width,int height, const char *imgName,GLuint *hmap); ++extern int CreateTexture(int width,int height,const char *imgName,GLuint *hmap); extern char GetChar(BYTE *keys); + #ifndef WINDOWS extern void ZeroMemory(void *buff,int size); + #endif extern BOOL DirExists(char *dirname); extern BOOL CheckEnv(); -extern char *LID(char *fileName); @@ -191,20 +192,20 @@ Index: bl24_lin_src/BlockOut/Types.h #endif /* TYPESH */ -Index: bl24_lin_src/BlockOut/Utils.cpp +Index: BL_SRC/BlockOut/Utils.cpp =================================================================== ---- bl24_lin_src.orig/BlockOut/Utils.cpp -+++ bl24_lin_src/BlockOut/Utils.cpp -@@ -191,7 +191,7 @@ BOOL CheckEnv() { +--- BL_SRC.orig/BlockOut/Utils.cpp ++++ BL_SRC/BlockOut/Utils.cpp +@@ -238,7 +238,7 @@ BOOL CheckEnv() { // Name: LID() // Desc: Locate file in the installation directory //----------------------------------------------------------------------------- -char *LID(char *fileName) { +char *LID(const char *fileName) { - static char ret[512]; - sprintf(ret,"%s/%s",bl2Home,fileName); -@@ -203,7 +203,7 @@ char *LID(char *fileName) { + #ifdef WINDOWS + return fileName; +@@ -254,7 +254,7 @@ char *LID(char *fileName) { // Name: LHD() // Desc: Locate file in the home directory //----------------------------------------------------------------------------- @@ -212,8 +213,8 @@ Index: bl24_lin_src/BlockOut/Utils.cpp +char *LHD(const char *fileName) { static char ret[512]; - sprintf(ret,"%s/%s",usrHome,fileName); -@@ -217,7 +217,7 @@ char *LHD(char *fileName) { + +@@ -278,7 +278,7 @@ char *LHD(char *fileName) { // Name: CreateTexture() // Desc: Create a texture (no alpha) //----------------------------------------------------------------------------- @@ -222,41 +223,32 @@ Index: bl24_lin_src/BlockOut/Utils.cpp *hmap = 0; CImage img; -Index: bl24_lin_src/ImageLib/src/jpg/jpegdecoder.cpp +Index: BL_SRC/ImageLib/src/jpg/jpegdecodermain.cpp =================================================================== ---- bl24_lin_src.orig/ImageLib/src/jpg/jpegdecoder.cpp -+++ bl24_lin_src/ImageLib/src/jpg/jpegdecoder.cpp -@@ -106,7 +106,7 @@ void *jpeg_decoder::alloc(int n) - blocks[i] = q; +--- BL_SRC.orig/ImageLib/src/jpg/jpegdecodermain.cpp ++++ BL_SRC/ImageLib/src/jpg/jpegdecodermain.cpp +@@ -54,7 +54,7 @@ int LoadJpegImage(JPEG_IMAGE *d) { + Pjpeg_decoder_file_stream Pinput_stream = new jpeg_decoder_file_stream(); - // Round to qword boundry, to avoid misaligned accesses with MMX code -- return ((void *)(((uint)q + 7) & ~7)); -+ return ((void *)(((unsigned long)q + 7) & ~7)); - } - //------------------------------------------------------------------------------ - // Clear buffer to word values. -@@ -1884,7 +1884,7 @@ void jpeg_decoder::init_frame(void) - q = (uchar *)alloc(max_blocks_per_row * 64 * sizeof(BLOCK_TYPE) + 8); + if( !Pinput_stream ) { +- sprintf(JpegErrorMessage,"Error: Unable to allocate memory for stream object!\n", Psrc_filename); ++ sprintf(JpegErrorMessage,"Error: Unable to allocate memory for stream object! %s\n", Psrc_filename); + return (FALSE); + } - // Align to 8-byte boundry, for MMX code -- q = (uchar *)(((uint)q + 7) & ~7); -+ q = (uchar *)(((unsigned long)q + 7) & ~7); +@@ -69,7 +69,7 @@ int LoadJpegImage(JPEG_IMAGE *d) { - // The block_seg[] array's name dates back to the - // 16-bit assembler implementation. "seg" stood for "segment". -@@ -1894,7 +1894,7 @@ void jpeg_decoder::init_frame(void) - for (i = 0; i < max_blocks_per_row; i++) - block_max_zag_set[i] = 64; + if( !Pd ) { + delete Pinput_stream; +- sprintf(JpegErrorMessage,"Error: Unable to allocate memory for decoder object!\n", Psrc_filename); ++ sprintf(JpegErrorMessage,"Error: Unable to allocate memory for decoder object! %s\n", Psrc_filename); + return (FALSE); + } -- Psample_buf = (uchar *)(((uint)alloc(max_blocks_per_row * 64 + 8) + 7) & ~7); -+ Psample_buf = (uchar *)(((unsigned long)alloc(max_blocks_per_row * 64 + 8) + 7) & ~7); - - total_lines_left = image_y_size; - -Index: bl24_lin_src/ImageLib/src/png/hpng.c +Index: BL_SRC/ImageLib/src/png/hpng.c =================================================================== ---- bl24_lin_src.orig/ImageLib/src/png/hpng.c -+++ bl24_lin_src/ImageLib/src/png/hpng.c +--- BL_SRC.orig/ImageLib/src/png/hpng.c ++++ BL_SRC/ImageLib/src/png/hpng.c @@ -1,6 +1,7 @@ #include #include