Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -ru scum-1.0-src.orig/Makefile.am scum-1.0-src/Makefile.am
- --- scum-1.0-src.orig/Makefile.am 2007-05-31 12:07:03.000000000 -0500
- +++ scum-1.0-src/Makefile.am 2011-08-05 20:28:09.000000000 -0500
- @@ -4,7 +4,7 @@
- AUTOMAKE_OPTIONS = 1.4
- ## Any directories that you want built and installed should go here.
- -SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game
- +SUBDIRS = utils utilssdl utilsgl tools data game
- ## Any directories you want a part of the distribution should be listed
- ## here, as well as have a Makefile generated at the end of configure.in
- diff -ru scum-1.0-src.orig/configure.in scum-1.0-src/configure.in
- --- scum-1.0-src.orig/configure.in 2007-05-31 12:07:03.000000000 -0500
- +++ scum-1.0-src/configure.in 2011-08-05 20:28:09.000000000 -0500
- @@ -99,11 +99,12 @@
- else
- LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS"
- CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include"
- - AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed))
- + AC_CHECK_LIB(png14, main,, AC_MSG_ERROR(libpng is needed))
- AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed))
- if test "x$TARGET" = xUNIX; then
- if test "x$enable_dyngl" = xoff; then
- AC_CHECK_LIB(GL, glBegin,, AC_MSG_ERROR(OpenGL is needed))
- + AC_CHECK_LIB(GLU, gluNewNurbsRenderer,, AC_MSG_ERROR(GLU is needed))
- fi
- fi
- fi
- @@ -115,9 +116,7 @@
- AC_CHECK_LIB(m, sin,,
- AC_MSG_ERROR(libm is needed))
- -AC_CONFIG_SUBDIRS(curl)
- -
- -AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile)
- +AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile)
- echo "Configuration:
- diff -ru scum-1.0-src.orig/defines.h.in scum-1.0-src/defines.h.in
- --- scum-1.0-src.orig/defines.h.in 2007-05-31 12:07:03.000000000 -0500
- +++ scum-1.0-src/defines.h.in 2011-08-05 20:35:26.000000000 -0500
- @@ -3,11 +3,14 @@
- /* Define to 1 if you have the `GL' library (-lGL). */
- #undef HAVE_LIBGL
- +/* Define to 1 if you have the `GLU' library (-lGLU). */
- +#undef HAVE_LIBGLU
- +
- /* Define to 1 if you have the `m' library (-lm). */
- #undef HAVE_LIBM
- -/* Define to 1 if you have the `png12' library (-lpng12). */
- -#undef HAVE_LIBPNG12
- +/* Define to 1 if you have the `png14' library (-lpng14). */
- +#undef HAVE_LIBPNG14
- /* Define to 1 if you have the `z' library (-lz). */
- #undef HAVE_LIBZ
- @@ -27,6 +30,9 @@
- /* Define to the one symbol short name of this package. */
- #undef PACKAGE_TARNAME
- +/* Define to the home page for this package. */
- +#undef PACKAGE_URL
- +
- /* Define to the version of this package. */
- #undef PACKAGE_VERSION
- diff -ru scum-1.0-src.orig/game/EnemyFactory.cpp scum-1.0-src/game/EnemyFactory.cpp
- --- scum-1.0-src.orig/game/EnemyFactory.cpp 2007-05-31 12:06:56.000000000 -0500
- +++ scum-1.0-src/game/EnemyFactory.cpp 2011-08-05 20:28:09.000000000 -0500
- @@ -44,7 +44,7 @@
- while( node)
- {
- count++;
- - node = node->NextSibling( name);
- + node = node->NextSibling( name.c_str());
- }
- return count;
- }
- @@ -59,10 +59,10 @@
- LEnemy *enemy = new LEnemy();
- elem = enemyNode->ToElement();
- - enemy->spawnTime = strToFloat( *elem->Attribute("spawnTime"));
- + enemy->spawnTime = strToFloat( elem->Attribute("spawnTime"));
- EnemyType enemyType = eSimpleEnemy;
- if( elem->Attribute("type"))
- - enemyType = (EnemyType)strToInt(*elem->Attribute("type"));
- + enemyType = (EnemyType)strToInt( elem->Attribute("type"));
- node = enemyNode->FirstChild("Model");
- elem = node->ToElement();
- @@ -70,23 +70,23 @@
- node = enemyNode->FirstChild("SpawnPoint");
- elem = node->ToElement();
- - enemy->spawnPoint.x = strToFloat( *elem->Attribute("x"));
- - enemy->spawnPoint.y = strToFloat( *elem->Attribute("y"));
- - enemy->spawnPoint.z = strToFloat( *elem->Attribute("z"));
- + enemy->spawnPoint.x = strToFloat( elem->Attribute("x"));
- + enemy->spawnPoint.y = strToFloat( elem->Attribute("y"));
- + enemy->spawnPoint.z = strToFloat( elem->Attribute("z"));
- node = enemyNode->FirstChild("Home");
- elem = node->ToElement();
- - enemy->home.x = strToFloat( *elem->Attribute("x"));
- - enemy->home.y = strToFloat( *elem->Attribute("y"));
- - enemy->home.z = strToFloat( *elem->Attribute("z"));
- + enemy->home.x = strToFloat( elem->Attribute("x"));
- + enemy->home.y = strToFloat( elem->Attribute("y"));
- + enemy->home.z = strToFloat( elem->Attribute("z"));
- node = enemyNode->FirstChild("EntryPath");
- elem = node->ToElement();
- - enemy->entry = lpm.getPath( *elem->Attribute("Name"));
- + enemy->entry = lpm.getPath( elem->Attribute("Name"));
- node = enemyNode->FirstChild("IdlePath");
- elem = node->ToElement();
- - enemy->idle = lpm.getPath( *elem->Attribute("Name"));
- + enemy->idle = lpm.getPath( elem->Attribute("Name"));
- node = enemyNode->FirstChild("AttackPath");
- enemy->numAttackPaths = countSiblings( node, "AttackPath");
- @@ -94,7 +94,7 @@
- for( int i=0; i< enemy->numAttackPaths; i++)
- {
- elem = node->ToElement();
- - enemy->attack[ i] = lpm.getPath( *elem->Attribute("Name"));
- + enemy->attack[ i] = lpm.getPath( elem->Attribute("Name"));
- node = node->NextSibling( "AttackPath");
- }
- @@ -104,7 +104,7 @@
- for( int i=0; i< enemy->numRetreatPaths; i++)
- {
- elem = node->ToElement();
- - enemy->retreat[ i] = lpm.getPath( *elem->Attribute("Name"));
- + enemy->retreat[ i] = lpm.getPath( elem->Attribute("Name"));
- node = node->NextSibling( "RetreatPath");
- }
- diff -ru scum-1.0-src.orig/game/Makefile.am scum-1.0-src/game/Makefile.am
- --- scum-1.0-src.orig/game/Makefile.am 2007-05-31 12:06:57.000000000 -0500
- +++ scum-1.0-src/game/Makefile.am 2011-08-05 20:28:09.000000000 -0500
- @@ -41,21 +41,21 @@
- main.cpp
- LDADD = \
- - ../curl/lib/libcurl.a \
- + -ltinyxml \
- + -lcurl \
- ../utils/libutils.a \
- ../utilssdl/libutilssdl.a \
- - ../utilsgl/libutilsgl.a \
- - ../tinyxml/libtinyxml.a
- + ../utilsgl/libutilsgl.a
- if WIN32
- -INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"./\"
- +INCLUDES = -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"./\"
- LDADD += sotu.res
- else
- if APPLE
- -INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"/Contents/Resources/\"
- +INCLUDES = -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"/Contents/Resources/\"
- else
- -INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\"
- +INCLUDES = -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\"
- endif
- endif
- diff -ru scum-1.0-src.orig/game/Makefile.my scum-1.0-src/game/Makefile.my
- --- scum-1.0-src.orig/game/Makefile.my 2007-05-31 12:06:57.000000000 -0500
- +++ scum-1.0-src/game/Makefile.my 2011-08-05 20:28:09.000000000 -0500
- @@ -127,7 +127,7 @@
- INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
- LDFLAGS =
- LIBOBJS =
- -LIBS = -lm -lGL -lz -lpng12 -L/usr/local/lib -L/usr/X11R6/lib -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lpthread -lSDL_image -lSDL_mixer -lGLU
- +LIBS = -lm -lGL -lz -lpng14 -L/usr/local/lib -L/usr/X11R6/lib -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lpthread -lSDL_image -lSDL_mixer -lGLU
- LTLIBOBJS =
- MAKEINFO = ${SHELL} /home/milanb/devel/svn/sotu/trunk/sotu/missing --run makeinfo
- OBJEXT = o
- diff -ru scum-1.0-src.orig/game/MenuManager.cpp scum-1.0-src/game/MenuManager.cpp
- --- scum-1.0-src.orig/game/MenuManager.cpp 2007-05-31 12:06:56.000000000 -0500
- +++ scum-1.0-src/game/MenuManager.cpp 2011-08-05 20:28:09.000000000 -0500
- @@ -278,7 +278,7 @@
- glDisable(GL_TEXTURE_2D);
- TiXmlElement* elem = _currentMenu->ToElement();
- - const string* val = elem->Attribute("Text");
- + const string* val = (string*)elem->Attribute("Text");
- if (val)
- {
- GLBitmapFont &fontWhite =
- diff -ru scum-1.0-src.orig/game/OnlineUpdate.cpp scum-1.0-src/game/OnlineUpdate.cpp
- --- scum-1.0-src.orig/game/OnlineUpdate.cpp 2007-05-31 12:06:56.000000000 -0500
- +++ scum-1.0-src/game/OnlineUpdate.cpp 2011-08-05 20:28:09.000000000 -0500
- @@ -215,7 +215,7 @@
- while( node)
- {
- TiXmlElement *element = node->ToElement();
- - const string *name = element->Attribute("Name");
- + const string *name = (string*)element->Attribute("Name");
- if( name && (*name == GAMETITLE))
- {
- // LOG_INFO << "Found " << GAMETITLE << " update section\n";
- @@ -227,8 +227,8 @@
- while( release)
- {
- element = release->ToElement();
- - const string *version = element->Attribute("Version");
- - const string *date = element->Attribute("Date");
- + const string *version = (string*)element->Attribute("Version");
- + const string *date = (string*)element->Attribute("Date");
- if( version && date)
- {
- // LOG_INFO << "Version " << *version << " released on " << *date << endl;
- @@ -291,8 +291,8 @@
- while( node)
- {
- TiXmlElement *element = node->ToElement();
- - const string *title = element->Attribute("Title");
- - const string *date = element->Attribute("Date");
- + const string *title = (string*)element->Attribute("Title");
- + const string *date = (string*)element->Attribute("Date");
- if( title && date)
- {
- TiXmlNode *body = element->FirstChild( "Body");
- diff -ru scum-1.0-src.orig/game/SelectableFactory.cpp scum-1.0-src/game/SelectableFactory.cpp
- --- scum-1.0-src.orig/game/SelectableFactory.cpp 2007-05-31 12:06:56.000000000 -0500
- +++ scum-1.0-src/game/SelectableFactory.cpp 2011-08-05 20:28:09.000000000 -0500
- @@ -73,7 +73,7 @@
- //----------------------------------------------------------------------------
- string SelectableFactory::getAttribute( const TiXmlElement* elem, string attr)
- {
- - const string *attrVal = elem->Attribute( attr);
- + const string *attrVal = (string*)elem->Attribute( attr.c_str());
- if( attrVal)
- {
- return *attrVal;
- diff -ru scum-1.0-src.orig/tools/Makefile.am scum-1.0-src/tools/Makefile.am
- --- scum-1.0-src.orig/tools/Makefile.am 2007-05-31 12:07:01.000000000 -0500
- +++ scum-1.0-src/tools/Makefile.am 2011-08-05 20:28:09.000000000 -0500
- @@ -4,7 +4,7 @@
- Packer_SOURCES = Packer.cpp
- INCLUDES = -I../utils
- -LDADD = ../utils/libutils.a
- +LDADD = ../utils/libutils.a ../utilssdl/libutilssdl.a ../utilsgl/libutilsgl.a
- MAINTAINERCLEANFILES = Makefile.bak Makefile.in
- endif
- diff -ru scum-1.0-src.orig/utils/Value.hpp scum-1.0-src/utils/Value.hpp
- --- scum-1.0-src.orig/utils/Value.hpp 2007-05-31 12:07:03.000000000 -0500
- +++ scum-1.0-src/utils/Value.hpp 2011-08-05 20:28:09.000000000 -0500
- @@ -16,6 +16,7 @@
- #define _Value_hpp_
- #include <stdio.h>
- +#include <stdlib.h>
- #include <string>
- #include <Trace.hpp>
- diff -ru scum-1.0-src.orig/utils/zStreamBufferImplZLib.cpp scum-1.0-src/utils/zStreamBufferImplZLib.cpp
- --- scum-1.0-src.orig/utils/zStreamBufferImplZLib.cpp 2007-05-31 12:07:03.000000000 -0500
- +++ scum-1.0-src/utils/zStreamBufferImplZLib.cpp 2011-08-05 20:28:09.000000000 -0500
- @@ -12,6 +12,7 @@
- // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
- //
- +#include <stdlib.h>
- #include <Trace.hpp>
- #include <zStreamBufferImplZLib.hpp>
- --- scum-1.0-src.orig/sotu.6 1969-12-31 18:00:00.000000000 -0600
- +++ scum-1.0-src/sotu.6 2011-08-05 20:28:09.000000000 -0500
- @@ -0,0 +1,55 @@
- +.\" Hey, EMACS: -*- nroff -*-
- +.\" First parameter, NAME, should be all caps
- +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
- +.\" other parameters are allowed: see man(7), man(1)
- +.TH CRITTER 6 "December 9, 2001"
- +.\" Please adjust this date whenever revising the manpage.
- +.\"
- +.\" Some roff macros, for reference:
- +.\" .nh disable hyphenation
- +.\" .hy enable hyphenation
- +.\" .ad l left justify
- +.\" .ad b justify to both left and right margins
- +.\" .nf disable filling
- +.\" .fi enable filling
- +.\" .br insert line break
- +.\" .sp <n> insert n+1 empty lines
- +.\" for manpage-specific macros, see man(7)
- +.SH NAME
- +Critical Mass \- Space shootemup resembling Galaxian
- +.SH SYNOPSIS
- +.B criticalmass
- +.RI [ options ]
- +.SH DESCRIPTION
- +This manual page documents the game \fBCritical Mass\fP.
- +This manual page was written for the Debian GNU/Linux distribution
- +because the original program does not have a manual page.
- +.PP
- +.\" TeX users may be more comfortable with the \fB<whatever>\fP and
- +.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
- +.\" respectively.
- +\fBcriticalmass\fP is a space shootemup similar to Galaxian. The basic idea
- +is simple: you move your ship back and forth at the bottom of the screen,
- +shooting up, while bad guys fly around and shoot down.
- +.PP
- +Additional documentation is available in
- +/usr/share/doc/criticalmass/Readme.html .
- +.SH OPTIONS
- +.TP
- +.B +fullscreen 0, +fullscreen 1
- +Run in windowed or in fullscreen mode, respectively.
- +.TP
- +.B +soundtrack FILE
- +Use the given file as a soundtrack.
- +.TP
- +.B +skill LEVEL
- +Start with the given skill level. LEVEL must be one of "ROOKIE", "NORMAL",
- +"EXPERT", and "INSANE".
- +.SH SEE ALSO
- +/usr/share/doc/criticalmass/Readme.html
- +.br
- +.SH AUTHOR
- +Criticalmass was written by Frank Becker <crittermail2005 at telus dot net>
- +.PP
- +This manual page was written by Daniel Burrows <dburrows at debian dot org>,
- +for the Debian GNU/Linux system (but may be used by others).
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement