jengelh/blockout
SHA256
1
0
Fork 0
forked from pool/blockout
Code Pull Requests Activity

Accepting request 294672 from games

Browse Source 
- Update to new upstream release 2.5

OBS-URL: https://build.opensuse.org/request/show/294672
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/blockout?expand=0&rev=7
This commit is contained in:
Dominique Leuenberger 2015-04-07 07:30:11 +00:00 committed by Git OBS Bridge
commit 7c917e9b6e
8 changed files with 178 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
automake.diff
View File

@ -2,18 +2,18 @@ From: Jan Engelhardt <jengelh@medozas.de>
Date: 2012-03-25 16:12:52.925160061 +0200 Date: 2012-03-25 16:12:52.925160061 +0200
--- ---
BlockOut/Makefile.am | 14 ++++++++++++++ BlockOut/Makefile.am | 11 +++++++++++
ImageLib/src/Makefile.am | 12 ++++++++++++ ImageLib/src/Makefile.am | 12 ++++++++++++
ImageLib/src/png/hpng.c | 2 +- ImageLib/src/png/hpng.c | 2 +-
Makefile.am | 3 +++ Makefile.am | 3 +++
configure.ac | 14 ++++++++++++++ configure.ac | 12 ++++++++++++
5 files changed, 44 insertions(+), 1 deletion(-) 5 files changed, 39 insertions(+), 1 deletion(-)
Index: bl24_lin_src/BlockOut/Makefile.am Index: BL_SRC/BlockOut/Makefile.am
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ bl24_lin_src/BlockOut/Makefile.am +++ BL_SRC/BlockOut/Makefile.am
@@ -0,0 +1,14 @@ @@ -0,0 +1,11 @@
+# -*- Makefile -*- +# -*- Makefile -*-
+ +
+AM_CPPFLAGS = -D_DEBUG -Dlinux -I../ImageLib/src -I. \ +AM_CPPFLAGS = -D_DEBUG -Dlinux -I../ImageLib/src -I. \
@ -21,17 +21,14 @@ Index: bl24_lin_src/BlockOut/Makefile.am
+ +
+bin_PROGRAMS = blockout +bin_PROGRAMS = blockout
+blockout_SOURCES = \ +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 = \ +blockout_LDADD = \
+ ../ImageLib/src/libimagelib.la \ + ../ImageLib/src/libimagelib.la \
+ ${libGL_LIBS} ${libGLU_LIBS} ${libSDL_LIBS} ${libSDL_mixer_LIBS} + ${libGL_LIBS} ${libGLU_LIBS} ${libSDL_LIBS} ${libSDL_mixer_LIBS}
+ Index: BL_SRC/ImageLib/src/Makefile.am
+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
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ bl24_lin_src/ImageLib/src/Makefile.am +++ BL_SRC/ImageLib/src/Makefile.am
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+# -*- Makefile -*- +# -*- Makefile -*-
+ +
@ -40,15 +37,15 @@ Index: bl24_lin_src/ImageLib/src/Makefile.am
+noinst_LTLIBRARIES = libimagelib.la +noinst_LTLIBRARIES = libimagelib.la
+ +
+libimagelib_la_SOURCES = \ +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 \ + jpg/H2v2.cpp jpg/idct.cpp jpg/jpegdecoder.cpp jpg/jpegdecodermain.cpp jpg/jpegdecoder.h jpg/main.h \
+ png/hpng.c png/hpng.h \ + png/hpng.c png/hpng.h \
+ CImage.cpp CImage.h + CImage.cpp CImage.h
+libimagelib_la_LIBADD = ${libpng_LIBS} +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 --- BL_SRC.orig/ImageLib/src/png/hpng.c
+++ bl24_lin_src/ImageLib/src/png/hpng.c +++ BL_SRC/ImageLib/src/png/hpng.c
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
#include <malloc.h> #include <malloc.h>
#include <math.h> #include <math.h>
@ -57,18 +54,18 @@ Index: bl24_lin_src/ImageLib/src/png/hpng.c
#include "hpng.h" #include "hpng.h"
char PngErrorMessage[1024]; char PngErrorMessage[1024];
Index: bl24_lin_src/Makefile.am Index: BL_SRC/Makefile.am
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ bl24_lin_src/Makefile.am +++ BL_SRC/Makefile.am
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
+# -*- Makefile -*- +# -*- Makefile -*-
+ +
+SUBDIRS = ImageLib/src BlockOut +SUBDIRS = ImageLib/src BlockOut
Index: bl24_lin_src/configure.ac Index: BL_SRC/configure.ac
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ bl24_lin_src/configure.ac +++ BL_SRC/configure.ac
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+AC_INIT([blockout], [2.4]) +AC_INIT([blockout], [2.4])
+AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_AUX_DIR([build-aux])

3
bl24-src-linux-i586.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1633a2f3d53c2ab44bcbaa731c21e84bc6e6e0a2aed80e5110e8a0b28fb24d77
size 4874736

3
bl25-linux-x86.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2bf9ab1798e7d3f82a372a3fae26a5c7699d1c57263253dce66f07fa418b702b
size 4379299

3
bl25-src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3abf61c4a7bd921988596a2239d76a5800fc94d8fd84dcc82c720d4d4f84cf0f
size 479743

30
bl2home.diff
View File

@ -6,10 +6,10 @@ Date: 2012-03-25 16:17:03.379573514 +0200
BlockOut/Utils.cpp | 2 ++ BlockOut/Utils.cpp | 2 ++
2 files changed, 3 insertions(+) 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 --- BL_SRC.orig/BlockOut/Makefile.am
+++ bl24_lin_src/BlockOut/Makefile.am +++ BL_SRC/BlockOut/Makefile.am
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
# -*- Makefile -*- # -*- Makefile -*-
@ -18,16 +18,16 @@ Index: bl24_lin_src/BlockOut/Makefile.am
${libSDL_CFLAGS} ${libSDL_mixer_CFLAGS} ${libSDL_CFLAGS} ${libSDL_mixer_CFLAGS}
bin_PROGRAMS = blockout bin_PROGRAMS = blockout
Index: bl24_lin_src/BlockOut/Utils.cpp Index: BL_SRC/BlockOut/Utils.cpp
=================================================================== ===================================================================
--- bl24_lin_src.orig/BlockOut/Utils.cpp --- BL_SRC.orig/BlockOut/Utils.cpp
+++ bl24_lin_src/BlockOut/Utils.cpp +++ BL_SRC/BlockOut/Utils.cpp
@@ -163,6 +163,8 @@ BOOL CheckEnv() { @@ -208,6 +208,8 @@ BOOL CheckEnv() {
} }
char *blockoutHome = getenv("BL2_HOME"); char *blockoutHome = getenv("BL2_HOME");
+ if (blockoutHome == NULL) + if (blockoutHome == NULL)
+ blockoutHome = BL2_HOME; + blockoutHome = BL2_HOME;
if( blockoutHome==NULL ) { if( blockoutHome==NULL ) {
printf("BL2_HOME environement variable if not defined !\n"); 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"); printf("Please set the BL2_HOME to the BlockOut II installation directory (ex: BL2_HOME=/usr/local/bl2).\n");

8
blockout.changes
View File

@ -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 Mon Nov 11 04:27:30 UTC 2013 - jengelh@inai.de

20
blockout.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package blockout # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,15 +17,15 @@
Name: blockout Name: blockout
Version: 2.4 Version: 2.5
Release: 0 Release: 0
Summary: A free clone of the original BlockOut DOS game Summary: A free clone of the original BlockOut DOS game
License: GPL-2.0 License: GPL-2.0
Group: Amusements/Games/Action/Arcade Group: Amusements/Games/Action/Arcade
Url: http://blockout.net/ Url: http://blockout.net/
#Freecode-URL: https://freecode.com/projects/blockout Source: http://downloads.sf.net/blockout/bl25-src.tar.gz
Source: bl24-src-linux-i586.tar.xz Source2: http://downloads.sf.net/blockout/bl25-linux-x86.tar.gz
Patch1: automake.diff Patch1: automake.diff
Patch2: compilefixes.diff Patch2: compilefixes.diff
Patch3: bl2home.diff Patch3: bl2home.diff
@ -34,7 +34,6 @@ BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libtool BuildRequires: libtool
BuildRequires: xz
BuildRequires: pkgconfig(SDL_mixer) BuildRequires: pkgconfig(SDL_mixer)
BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(sdl) BuildRequires: pkgconfig(sdl)
@ -47,7 +46,8 @@ game has been designed to reproduce the original game kinematics as
accurately as possible. accurately as possible.
%prep %prep
%setup -qn bl24_lin_src # images, sounds, are in #2.
%setup -qn BL_SRC -a2
%patch -P 1 -P 2 -P 3 -p1 %patch -P 1 -P 2 -P 3 -p1
%build %build
@ -56,11 +56,15 @@ autoreconf -fi
make %{?_smp_mflags} make %{?_smp_mflags}
%install %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 %files
%defattr(-,root,root) %defattr(-,root,root)
%_bindir/blockout %_bindir/blockout
%_datadir/%name %_datadir/%name/
%changelog %changelog

248
compilefixes.diff
View File

@ -2,26 +2,26 @@ From: Jan Engelhardt <jengelh@medozas.de>
Date: 2012-03-25 16:06:07.551725021 +0200 Date: 2012-03-25 16:06:07.551725021 +0200
--- ---
BlockOut/EditControl.cpp | 2 +- BlockOut/EditControl.cpp | 2 +-
BlockOut/EditControl.h | 2 +- BlockOut/EditControl.h | 2 +-
BlockOut/GLApp/GLApp.h | 2 +- BlockOut/GLApp/GLApp.h | 2 +-
BlockOut/GLApp/GLFont.cpp | 3 +-- BlockOut/GLApp/GLFont.cpp | 2 +-
BlockOut/GLApp/GLSprite.cpp | 4 ++-- BlockOut/GLApp/GLSprite.cpp | 5 ++---
BlockOut/GLApp/GLSprite.h | 2 +- BlockOut/GLApp/GLSprite.h | 2 +-
BlockOut/Menu.h | 4 ++-- BlockOut/Menu.h | 4 ++--
BlockOut/MenuGraphics.cpp | 4 ++-- BlockOut/MenuGraphics.cpp | 4 ++--
BlockOut/SetupManager.cpp | 2 +- BlockOut/SetupManager.cpp | 2 +-
BlockOut/SetupManager.h | 2 +- BlockOut/SetupManager.h | 2 +-
BlockOut/Types.h | 6 +++--- BlockOut/Types.h | 6 +++---
BlockOut/Utils.cpp | 6 +++--- BlockOut/Utils.cpp | 6 +++---
ImageLib/src/jpg/jpegdecoder.cpp | 6 +++--- ImageLib/src/jpg/jpegdecodermain.cpp | 4 ++--
ImageLib/src/png/hpng.c | 6 +----- ImageLib/src/png/hpng.c | 7 ++-----
14 files changed, 23 insertions(+), 28 deletions(-) 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 --- BL_SRC.orig/BlockOut/EditControl.cpp
+++ bl24_lin_src/BlockOut/EditControl.cpp +++ BL_SRC/BlockOut/EditControl.cpp
@@ -30,7 +30,7 @@ void EditControl::SetDisplayLength(int l @@ -30,7 +30,7 @@ void EditControl::SetDisplayLength(int l
// ------------------------------------------------ // ------------------------------------------------
@ -31,10 +31,10 @@ Index: bl24_lin_src/BlockOut/EditControl.cpp
if( strlen(text)>=255 ) { if( strlen(text)>=255 ) {
strncpy(editText,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 --- BL_SRC.orig/BlockOut/EditControl.h
+++ bl24_lin_src/BlockOut/EditControl.h +++ BL_SRC/BlockOut/EditControl.h
@@ -27,7 +27,7 @@ class EditControl { @@ -27,7 +27,7 @@ class EditControl {
void SetDisplayLength(int length); void SetDisplayLength(int length);
@ -44,11 +44,11 @@ Index: bl24_lin_src/BlockOut/EditControl.h
// Get the mode // Get the mode
BOOL GetMode(); 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 --- BL_SRC.orig/BlockOut/GLApp/GLApp.h
+++ bl24_lin_src/BlockOut/GLApp/GLApp.h +++ BL_SRC/BlockOut/GLApp/GLApp.h
@@ -57,7 +57,7 @@ protected: @@ -60,7 +60,7 @@ protected:
// Internal variables for the state of the app // Internal variables for the state of the app
BOOL m_bWindowed; BOOL m_bWindowed;
@ -56,36 +56,35 @@ Index: bl24_lin_src/BlockOut/GLApp/GLApp.h
+ const char *m_strWindowTitle; + const char *m_strWindowTitle;
int m_screenWidth; int m_screenWidth;
int m_screenHeight; int m_screenHeight;
BOOL m_bVSync;
Index: bl24_lin_src/BlockOut/GLApp/GLFont.cpp Index: BL_SRC/BlockOut/GLApp/GLFont.cpp
=================================================================== ===================================================================
--- bl24_lin_src.orig/BlockOut/GLApp/GLFont.cpp --- BL_SRC.orig/BlockOut/GLApp/GLFont.cpp
+++ bl24_lin_src/BlockOut/GLApp/GLFont.cpp +++ BL_SRC/BlockOut/GLApp/GLFont.cpp
@@ -6,8 +6,7 @@ @@ -8,7 +8,7 @@
#include <malloc.h> #undef LoadImage
#include <stdio.h> #include <CImage.h>
-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 <string.h> #include <string.h>
#undef LoadImage
#include <CImage.h>
- -
-extern char *LID(char *fileName); -extern char *LID(char *fileName);
+#include "../Types.h" +#include "../Types.h"
// ------------------------------------------- // -------------------------------------------
Index: bl24_lin_src/BlockOut/GLApp/GLSprite.cpp @@ -54,7 +53,7 @@ void Sprite2D::UpdateSprite(int x1,int y
===================================================================
--- bl24_lin_src.orig/BlockOut/GLApp/GLSprite.cpp
+++ bl24_lin_src/BlockOut/GLApp/GLSprite.cpp
@@ -6,8 +6,8 @@
#include <malloc.h>
#include <stdio.h>
#include <string.h>
+#include "../Types.h"
-extern char *LID(char *fileName);
// -------------------------------------------
@@ -53,7 +53,7 @@ void Sprite2D::UpdateSprite(int x1,int y
// ------------------------------------------- // -------------------------------------------
@ -94,24 +93,24 @@ Index: bl24_lin_src/BlockOut/GLApp/GLSprite.cpp
GLint bpp; GLint bpp;
GLenum format; 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 --- BL_SRC.orig/BlockOut/GLApp/GLSprite.h
+++ bl24_lin_src/BlockOut/GLApp/GLSprite.h +++ BL_SRC/BlockOut/GLApp/GLSprite.h
@@ -15,7 +15,7 @@ public: @@ -15,7 +15,7 @@ public:
// Initialise the font // Initialise the sprite
// return 1 when success, 0 otherwise // return 1 when success, 0 otherwise
- int RestoreDeviceObjects(char *diffName,char *alphaName,int srcWidth,int scrHeight); - int RestoreDeviceObjects(char *diffName,char *alphaName,int srcWidth,int scrHeight);
+ int RestoreDeviceObjects(const char *diffName, const char *alphaName,int srcWidth,int scrHeight); + int RestoreDeviceObjects(const char *diffName, const char *alphaName,int srcWidth,int scrHeight);
// Update sprite mapping and coordinates // Update sprite mapping and coordinates
void UpdateSprite(int x1,int y1,int x2,int y2); 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 --- BL_SRC.orig/BlockOut/Menu.h
+++ bl24_lin_src/BlockOut/Menu.h +++ BL_SRC/BlockOut/Menu.h
@@ -60,8 +60,8 @@ class Menu { @@ -61,8 +61,8 @@ class Menu {
// Menu page // Menu page
void ToPage(MenuPage *page); void ToPage(MenuPage *page);
void ToPage(MenuPage *page,int iParam,void *wParam); void ToPage(MenuPage *page,int iParam,void *wParam);
@ -122,10 +121,10 @@ Index: bl24_lin_src/BlockOut/Menu.h
PageMainMenu mainMenuPage; PageMainMenu mainMenuPage;
PageStartGame startGamePage; PageStartGame startGamePage;
Index: bl24_lin_src/BlockOut/MenuGraphics.cpp Index: BL_SRC/BlockOut/MenuGraphics.cpp
=================================================================== ===================================================================
--- bl24_lin_src.orig/BlockOut/MenuGraphics.cpp --- BL_SRC.orig/BlockOut/MenuGraphics.cpp
+++ bl24_lin_src/BlockOut/MenuGraphics.cpp +++ BL_SRC/BlockOut/MenuGraphics.cpp
@@ -438,7 +438,7 @@ void Menu::RenderChar(int x,int y,int w, @@ -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(char *title) {
+void Menu::RenderTitle(const char *title) { +void Menu::RenderTitle(const char *title) {
int lgth = strlen(title); int lgth = (int)strlen(title);
int nwFont = fround((float)wFont*1.1f); int nwFont = fround((float)wFont*1.1f);
@@ -454,7 +454,7 @@ void Menu::RenderTitle(char *title) { @@ -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 startLine = 0.515f;
float startColumn = 0.15f; float startColumn = 0.15f;
Index: bl24_lin_src/BlockOut/SetupManager.cpp Index: BL_SRC/BlockOut/SetupManager.cpp
=================================================================== ===================================================================
--- bl24_lin_src.orig/BlockOut/SetupManager.cpp --- BL_SRC.orig/BlockOut/SetupManager.cpp
+++ bl24_lin_src/BlockOut/SetupManager.cpp +++ BL_SRC/BlockOut/SetupManager.cpp
@@ -363,7 +363,7 @@ int SetupManager::GetTimeout() { @@ -364,7 +364,7 @@ int SetupManager::GetTimeout() {
// ------------------------------------------------ // ------------------------------------------------
-char *SetupManager::GetName() { -char *SetupManager::GetName() {
+const char *SetupManager::GetName() { +const char *SetupManager::GetName() {
static char ret[32]; static char ret[32];
strcpy(ret,""); strcpy(ret,"");
Index: bl24_lin_src/BlockOut/SetupManager.h Index: BL_SRC/BlockOut/SetupManager.h
=================================================================== ===================================================================
--- bl24_lin_src.orig/BlockOut/SetupManager.h --- BL_SRC.orig/BlockOut/SetupManager.h
+++ bl24_lin_src/BlockOut/SetupManager.h +++ BL_SRC/BlockOut/SetupManager.h
@@ -49,7 +49,7 @@ class SetupManager { @@ -67,7 +67,7 @@ class SetupManager {
float GetAnimationTime(); /* in seconds */ float GetAnimationTime(); /* in seconds */
// Names // Names
- char *GetName(); - char *GetName();
+ const char *GetName(); + const char *GetName();
const char *GetBlockSetName(); const char *GetBlockSetName();
// Sound // Sound
Index: bl24_lin_src/BlockOut/Types.h Index: BL_SRC/BlockOut/Types.h
=================================================================== ===================================================================
--- bl24_lin_src.orig/BlockOut/Types.h --- BL_SRC.orig/BlockOut/Types.h
+++ bl24_lin_src/BlockOut/Types.h +++ BL_SRC/BlockOut/Types.h
@@ -160,13 +160,13 @@ extern int fround(float x); @@ -203,15 +203,15 @@ extern int fround(float x);
extern char *FormatTime(float seconds); extern char *FormatTime(float seconds);
extern char *FormatDate(int time); extern char *FormatDate(uint32 time);
extern char *FormatDateShort(int time); extern char *FormatDateShort(uint32 time);
-extern int CreateTexture(int width,int height,char *imgName,GLuint *hmap); -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); extern char GetChar(BYTE *keys);
#ifndef WINDOWS
extern void ZeroMemory(void *buff,int size); extern void ZeroMemory(void *buff,int size);
#endif
extern BOOL DirExists(char *dirname); extern BOOL DirExists(char *dirname);
extern BOOL CheckEnv(); extern BOOL CheckEnv();
-extern char *LID(char *fileName); -extern char *LID(char *fileName);
@ -191,20 +192,20 @@ Index: bl24_lin_src/BlockOut/Types.h
#endif /* TYPESH */ #endif /* TYPESH */
Index: bl24_lin_src/BlockOut/Utils.cpp Index: BL_SRC/BlockOut/Utils.cpp
=================================================================== ===================================================================
--- bl24_lin_src.orig/BlockOut/Utils.cpp --- BL_SRC.orig/BlockOut/Utils.cpp
+++ bl24_lin_src/BlockOut/Utils.cpp +++ BL_SRC/BlockOut/Utils.cpp
@@ -191,7 +191,7 @@ BOOL CheckEnv() { @@ -238,7 +238,7 @@ BOOL CheckEnv() {
// Name: LID() // Name: LID()
// Desc: Locate file in the installation directory // Desc: Locate file in the installation directory
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
-char *LID(char *fileName) { -char *LID(char *fileName) {
+char *LID(const char *fileName) { +char *LID(const char *fileName) {
static char ret[512]; #ifdef WINDOWS
sprintf(ret,"%s/%s",bl2Home,fileName); return fileName;
@@ -203,7 +203,7 @@ char *LID(char *fileName) { @@ -254,7 +254,7 @@ char *LID(char *fileName) {
// Name: LHD() // Name: LHD()
// Desc: Locate file in the home directory // Desc: Locate file in the home directory
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -212,8 +213,8 @@ Index: bl24_lin_src/BlockOut/Utils.cpp
+char *LHD(const char *fileName) { +char *LHD(const char *fileName) {
static char ret[512]; 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() // Name: CreateTexture()
// Desc: Create a texture (no alpha) // Desc: Create a texture (no alpha)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -222,41 +223,32 @@ Index: bl24_lin_src/BlockOut/Utils.cpp
*hmap = 0; *hmap = 0;
CImage img; 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 --- BL_SRC.orig/ImageLib/src/jpg/jpegdecodermain.cpp
+++ bl24_lin_src/ImageLib/src/jpg/jpegdecoder.cpp +++ BL_SRC/ImageLib/src/jpg/jpegdecodermain.cpp
@@ -106,7 +106,7 @@ void *jpeg_decoder::alloc(int n) @@ -54,7 +54,7 @@ int LoadJpegImage(JPEG_IMAGE *d) {
blocks[i] = q; Pjpeg_decoder_file_stream Pinput_stream = new jpeg_decoder_file_stream();
// Round to qword boundry, to avoid misaligned accesses with MMX code if( !Pinput_stream ) {
- return ((void *)(((uint)q + 7) & ~7)); - sprintf(JpegErrorMessage,"Error: Unable to allocate memory for stream object!\n", Psrc_filename);
+ return ((void *)(((unsigned long)q + 7) & ~7)); + sprintf(JpegErrorMessage,"Error: Unable to allocate memory for stream object! %s\n", Psrc_filename);
} return (FALSE);
//------------------------------------------------------------------------------ }
// 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);
// Align to 8-byte boundry, for MMX code @@ -69,7 +69,7 @@ int LoadJpegImage(JPEG_IMAGE *d) {
- q = (uchar *)(((uint)q + 7) & ~7);
+ q = (uchar *)(((unsigned long)q + 7) & ~7);
// The block_seg[] array's name dates back to the if( !Pd ) {
// 16-bit assembler implementation. "seg" stood for "segment". delete Pinput_stream;
@@ -1894,7 +1894,7 @@ void jpeg_decoder::init_frame(void) - sprintf(JpegErrorMessage,"Error: Unable to allocate memory for decoder object!\n", Psrc_filename);
for (i = 0; i < max_blocks_per_row; i++) + sprintf(JpegErrorMessage,"Error: Unable to allocate memory for decoder object! %s\n", Psrc_filename);
block_max_zag_set[i] = 64; return (FALSE);
}
- Psample_buf = (uchar *)(((uint)alloc(max_blocks_per_row * 64 + 8) + 7) & ~7); Index: BL_SRC/ImageLib/src/png/hpng.c
+ 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
=================================================================== ===================================================================
--- bl24_lin_src.orig/ImageLib/src/png/hpng.c --- BL_SRC.orig/ImageLib/src/png/hpng.c
+++ bl24_lin_src/ImageLib/src/png/hpng.c +++ BL_SRC/ImageLib/src/png/hpng.c
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
#include <malloc.h> #include <malloc.h>
#include <math.h> #include <math.h>