daily pastebin goal
19%
SHARE
TWEET

scum-1.0_new_shit.patch

h3xx Aug 5th, 2011 166 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff -ru scum-1.0-src.orig/Makefile.am scum-1.0-src/Makefile.am
  2. --- scum-1.0-src.orig/Makefile.am       2007-05-31 12:07:03.000000000 -0500
  3. +++ scum-1.0-src/Makefile.am    2011-08-05 20:28:09.000000000 -0500
  4. @@ -4,7 +4,7 @@
  5.  AUTOMAKE_OPTIONS = 1.4
  6.  
  7.  ## Any directories that you want built and installed should go here.
  8. -SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game
  9. +SUBDIRS = utils utilssdl utilsgl tools data game
  10.  
  11.  ## Any directories you want a part of the distribution should be listed
  12.  ## here, as well as have a Makefile generated at the end of configure.in
  13. diff -ru scum-1.0-src.orig/configure.in scum-1.0-src/configure.in
  14. --- scum-1.0-src.orig/configure.in      2007-05-31 12:07:03.000000000 -0500
  15. +++ scum-1.0-src/configure.in   2011-08-05 20:28:09.000000000 -0500
  16. @@ -99,11 +99,12 @@
  17.  else
  18.      LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS"
  19.      CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include"
  20. -       AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed))
  21. +       AC_CHECK_LIB(png14, main,, AC_MSG_ERROR(libpng is needed))
  22.         AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed))
  23.         if test "x$TARGET" = xUNIX; then
  24.             if test "x$enable_dyngl" = xoff; then
  25.                 AC_CHECK_LIB(GL, glBegin,, AC_MSG_ERROR(OpenGL is needed))
  26. +               AC_CHECK_LIB(GLU, gluNewNurbsRenderer,, AC_MSG_ERROR(GLU is needed))
  27.             fi
  28.         fi
  29.  fi
  30. @@ -115,9 +116,7 @@
  31.  AC_CHECK_LIB(m, sin,,
  32.      AC_MSG_ERROR(libm is needed))
  33.  
  34. -AC_CONFIG_SUBDIRS(curl)
  35. -
  36. -AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile)
  37. +AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile)
  38.  
  39.  echo "Configuration:
  40.  
  41. diff -ru scum-1.0-src.orig/defines.h.in scum-1.0-src/defines.h.in
  42. --- scum-1.0-src.orig/defines.h.in      2007-05-31 12:07:03.000000000 -0500
  43. +++ scum-1.0-src/defines.h.in   2011-08-05 20:35:26.000000000 -0500
  44. @@ -3,11 +3,14 @@
  45.  /* Define to 1 if you have the `GL' library (-lGL). */
  46.  #undef HAVE_LIBGL
  47.  
  48. +/* Define to 1 if you have the `GLU' library (-lGLU). */
  49. +#undef HAVE_LIBGLU
  50. +
  51.  /* Define to 1 if you have the `m' library (-lm). */
  52.  #undef HAVE_LIBM
  53.  
  54. -/* Define to 1 if you have the `png12' library (-lpng12). */
  55. -#undef HAVE_LIBPNG12
  56. +/* Define to 1 if you have the `png14' library (-lpng14). */
  57. +#undef HAVE_LIBPNG14
  58.  
  59.  /* Define to 1 if you have the `z' library (-lz). */
  60.  #undef HAVE_LIBZ
  61. @@ -27,6 +30,9 @@
  62.  /* Define to the one symbol short name of this package. */
  63.  #undef PACKAGE_TARNAME
  64.  
  65. +/* Define to the home page for this package. */
  66. +#undef PACKAGE_URL
  67. +
  68.  /* Define to the version of this package. */
  69.  #undef PACKAGE_VERSION
  70.  
  71. diff -ru scum-1.0-src.orig/game/EnemyFactory.cpp scum-1.0-src/game/EnemyFactory.cpp
  72. --- scum-1.0-src.orig/game/EnemyFactory.cpp     2007-05-31 12:06:56.000000000 -0500
  73. +++ scum-1.0-src/game/EnemyFactory.cpp  2011-08-05 20:28:09.000000000 -0500
  74. @@ -44,7 +44,7 @@
  75.      while( node)
  76.      {
  77.         count++;
  78. -       node = node->NextSibling( name);
  79. +       node = node->NextSibling( name.c_str());
  80.      }
  81.      return count;
  82.  }
  83. @@ -59,10 +59,10 @@
  84.      LEnemy *enemy = new LEnemy();
  85.  
  86.      elem = enemyNode->ToElement();
  87. -    enemy->spawnTime = strToFloat( *elem->Attribute("spawnTime"));
  88. +    enemy->spawnTime = strToFloat( elem->Attribute("spawnTime"));
  89.      EnemyType enemyType = eSimpleEnemy;
  90.      if( elem->Attribute("type"))
  91. -       enemyType = (EnemyType)strToInt(*elem->Attribute("type"));
  92. +       enemyType = (EnemyType)strToInt( elem->Attribute("type"));
  93.  
  94.      node = enemyNode->FirstChild("Model");
  95.      elem = node->ToElement();
  96. @@ -70,23 +70,23 @@
  97.      
  98.      node = enemyNode->FirstChild("SpawnPoint");
  99.      elem = node->ToElement();
  100. -    enemy->spawnPoint.x = strToFloat( *elem->Attribute("x"));
  101. -    enemy->spawnPoint.y = strToFloat( *elem->Attribute("y"));
  102. -    enemy->spawnPoint.z = strToFloat( *elem->Attribute("z"));
  103. +    enemy->spawnPoint.x = strToFloat( elem->Attribute("x"));
  104. +    enemy->spawnPoint.y = strToFloat( elem->Attribute("y"));
  105. +    enemy->spawnPoint.z = strToFloat( elem->Attribute("z"));
  106.      
  107.      node = enemyNode->FirstChild("Home");
  108.      elem = node->ToElement();
  109. -    enemy->home.x = strToFloat( *elem->Attribute("x"));
  110. -    enemy->home.y = strToFloat( *elem->Attribute("y"));
  111. -    enemy->home.z = strToFloat( *elem->Attribute("z"));
  112. +    enemy->home.x = strToFloat( elem->Attribute("x"));
  113. +    enemy->home.y = strToFloat( elem->Attribute("y"));
  114. +    enemy->home.z = strToFloat( elem->Attribute("z"));
  115.  
  116.      node = enemyNode->FirstChild("EntryPath");
  117.      elem = node->ToElement();
  118. -    enemy->entry = lpm.getPath( *elem->Attribute("Name"));
  119. +    enemy->entry = lpm.getPath( elem->Attribute("Name"));
  120.  
  121.      node = enemyNode->FirstChild("IdlePath");
  122.      elem = node->ToElement();
  123. -    enemy->idle = lpm.getPath( *elem->Attribute("Name"));
  124. +    enemy->idle = lpm.getPath( elem->Attribute("Name"));
  125.  
  126.      node = enemyNode->FirstChild("AttackPath");
  127.      enemy->numAttackPaths = countSiblings( node, "AttackPath");
  128. @@ -94,7 +94,7 @@
  129.      for( int i=0; i< enemy->numAttackPaths; i++)
  130.      {
  131.         elem = node->ToElement();
  132. -       enemy->attack[ i] = lpm.getPath( *elem->Attribute("Name"));
  133. +       enemy->attack[ i] = lpm.getPath( elem->Attribute("Name"));
  134.         node = node->NextSibling( "AttackPath");
  135.      }
  136.  
  137. @@ -104,7 +104,7 @@
  138.      for( int i=0; i< enemy->numRetreatPaths; i++)
  139.      {
  140.         elem = node->ToElement();
  141. -       enemy->retreat[ i] = lpm.getPath( *elem->Attribute("Name"));
  142. +       enemy->retreat[ i] = lpm.getPath( elem->Attribute("Name"));
  143.         node = node->NextSibling( "RetreatPath");
  144.      }
  145.  
  146. diff -ru scum-1.0-src.orig/game/Makefile.am scum-1.0-src/game/Makefile.am
  147. --- scum-1.0-src.orig/game/Makefile.am  2007-05-31 12:06:57.000000000 -0500
  148. +++ scum-1.0-src/game/Makefile.am       2011-08-05 20:28:09.000000000 -0500
  149. @@ -41,21 +41,21 @@
  150.          main.cpp
  151.  
  152.  LDADD = \
  153. -       ../curl/lib/libcurl.a \
  154. +       -ltinyxml \
  155. +       -lcurl \
  156.         ../utils/libutils.a \
  157.         ../utilssdl/libutilssdl.a \
  158. -       ../utilsgl/libutilsgl.a \
  159. -       ../tinyxml/libtinyxml.a
  160. +       ../utilsgl/libutilsgl.a
  161.  
  162.  if WIN32
  163. -INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"./\"
  164. +INCLUDES = -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"./\"
  165.  LDADD += sotu.res
  166.  else
  167.  
  168.  if APPLE
  169. -INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"/Contents/Resources/\"
  170. +INCLUDES = -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"/Contents/Resources/\"
  171.  else
  172. -INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\"
  173. +INCLUDES = -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\"
  174.  endif
  175.  
  176.  endif
  177. diff -ru scum-1.0-src.orig/game/Makefile.my scum-1.0-src/game/Makefile.my
  178. --- scum-1.0-src.orig/game/Makefile.my  2007-05-31 12:06:57.000000000 -0500
  179. +++ scum-1.0-src/game/Makefile.my       2011-08-05 20:28:09.000000000 -0500
  180. @@ -127,7 +127,7 @@
  181.  INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
  182.  LDFLAGS =
  183.  LIBOBJS =
  184. -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
  185. +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
  186.  LTLIBOBJS =
  187.  MAKEINFO = ${SHELL} /home/milanb/devel/svn/sotu/trunk/sotu/missing --run makeinfo
  188.  OBJEXT = o
  189. diff -ru scum-1.0-src.orig/game/MenuManager.cpp scum-1.0-src/game/MenuManager.cpp
  190. --- scum-1.0-src.orig/game/MenuManager.cpp      2007-05-31 12:06:56.000000000 -0500
  191. +++ scum-1.0-src/game/MenuManager.cpp   2011-08-05 20:28:09.000000000 -0500
  192. @@ -278,7 +278,7 @@
  193.      glDisable(GL_TEXTURE_2D);
  194.  
  195.      TiXmlElement* elem = _currentMenu->ToElement();
  196. -    const string* val = elem->Attribute("Text");
  197. +    const string* val = (string*)elem->Attribute("Text");
  198.      if (val)
  199.      {
  200.          GLBitmapFont &fontWhite =
  201. diff -ru scum-1.0-src.orig/game/OnlineUpdate.cpp scum-1.0-src/game/OnlineUpdate.cpp
  202. --- scum-1.0-src.orig/game/OnlineUpdate.cpp     2007-05-31 12:06:56.000000000 -0500
  203. +++ scum-1.0-src/game/OnlineUpdate.cpp  2011-08-05 20:28:09.000000000 -0500
  204. @@ -215,7 +215,7 @@
  205.         while( node)
  206.         {
  207.             TiXmlElement *element = node->ToElement();
  208. -           const string *name = element->Attribute("Name");
  209. +           const string *name = (string*)element->Attribute("Name");
  210.             if( name && (*name == GAMETITLE))
  211.             {
  212.  //             LOG_INFO << "Found " << GAMETITLE << " update section\n";
  213. @@ -227,8 +227,8 @@
  214.                 while( release)
  215.                 {
  216.                     element = release->ToElement();
  217. -                   const string *version = element->Attribute("Version");
  218. -                   const string *date = element->Attribute("Date");
  219. +                   const string *version = (string*)element->Attribute("Version");
  220. +                   const string *date = (string*)element->Attribute("Date");
  221.                     if( version && date)
  222.                     {
  223.  //                     LOG_INFO << "Version " << *version << " released on " << *date << endl;
  224. @@ -291,8 +291,8 @@
  225.         while( node)
  226.         {
  227.             TiXmlElement *element = node->ToElement();
  228. -           const string *title = element->Attribute("Title");
  229. -           const string *date = element->Attribute("Date");
  230. +           const string *title = (string*)element->Attribute("Title");
  231. +           const string *date = (string*)element->Attribute("Date");
  232.             if( title && date)
  233.             {
  234.                 TiXmlNode *body = element->FirstChild( "Body");
  235. diff -ru scum-1.0-src.orig/game/SelectableFactory.cpp scum-1.0-src/game/SelectableFactory.cpp
  236. --- scum-1.0-src.orig/game/SelectableFactory.cpp        2007-05-31 12:06:56.000000000 -0500
  237. +++ scum-1.0-src/game/SelectableFactory.cpp     2011-08-05 20:28:09.000000000 -0500
  238. @@ -73,7 +73,7 @@
  239.  //----------------------------------------------------------------------------
  240.  string SelectableFactory::getAttribute( const TiXmlElement* elem, string attr)
  241.  {
  242. -    const string *attrVal = elem->Attribute( attr);
  243. +    const string *attrVal = (string*)elem->Attribute( attr.c_str());
  244.      if( attrVal)
  245.      {
  246.          return *attrVal;
  247. diff -ru scum-1.0-src.orig/tools/Makefile.am scum-1.0-src/tools/Makefile.am
  248. --- scum-1.0-src.orig/tools/Makefile.am 2007-05-31 12:07:01.000000000 -0500
  249. +++ scum-1.0-src/tools/Makefile.am      2011-08-05 20:28:09.000000000 -0500
  250. @@ -4,7 +4,7 @@
  251.  Packer_SOURCES = Packer.cpp
  252.  
  253.  INCLUDES = -I../utils
  254. -LDADD = ../utils/libutils.a
  255. +LDADD = ../utils/libutils.a ../utilssdl/libutilssdl.a ../utilsgl/libutilsgl.a
  256.  
  257.  MAINTAINERCLEANFILES = Makefile.bak Makefile.in
  258.  endif
  259. diff -ru scum-1.0-src.orig/utils/Value.hpp scum-1.0-src/utils/Value.hpp
  260. --- scum-1.0-src.orig/utils/Value.hpp   2007-05-31 12:07:03.000000000 -0500
  261. +++ scum-1.0-src/utils/Value.hpp        2011-08-05 20:28:09.000000000 -0500
  262. @@ -16,6 +16,7 @@
  263.  #define _Value_hpp_
  264.  
  265.  #include <stdio.h>
  266. +#include <stdlib.h>
  267.  #include <string>
  268.  
  269.  #include <Trace.hpp>
  270. diff -ru scum-1.0-src.orig/utils/zStreamBufferImplZLib.cpp scum-1.0-src/utils/zStreamBufferImplZLib.cpp
  271. --- scum-1.0-src.orig/utils/zStreamBufferImplZLib.cpp   2007-05-31 12:07:03.000000000 -0500
  272. +++ scum-1.0-src/utils/zStreamBufferImplZLib.cpp        2011-08-05 20:28:09.000000000 -0500
  273. @@ -12,6 +12,7 @@
  274.  // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  275.  // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
  276.  //
  277. +#include <stdlib.h>
  278.  #include <Trace.hpp>
  279.  #include <zStreamBufferImplZLib.hpp>
  280.  
  281. --- scum-1.0-src.orig/sotu.6    1969-12-31 18:00:00.000000000 -0600
  282. +++ scum-1.0-src/sotu.6 2011-08-05 20:28:09.000000000 -0500
  283. @@ -0,0 +1,55 @@
  284. +.\"                                      Hey, EMACS: -*- nroff -*-
  285. +.\" First parameter, NAME, should be all caps
  286. +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
  287. +.\" other parameters are allowed: see man(7), man(1)
  288. +.TH CRITTER 6 "December  9, 2001"
  289. +.\" Please adjust this date whenever revising the manpage.
  290. +.\"
  291. +.\" Some roff macros, for reference:
  292. +.\" .nh        disable hyphenation
  293. +.\" .hy        enable hyphenation
  294. +.\" .ad l      left justify
  295. +.\" .ad b      justify to both left and right margins
  296. +.\" .nf        disable filling
  297. +.\" .fi        enable filling
  298. +.\" .br        insert line break
  299. +.\" .sp <n>    insert n+1 empty lines
  300. +.\" for manpage-specific macros, see man(7)
  301. +.SH NAME
  302. +Critical Mass \- Space shootemup resembling Galaxian
  303. +.SH SYNOPSIS
  304. +.B criticalmass
  305. +.RI [ options ]
  306. +.SH DESCRIPTION
  307. +This manual page documents the game \fBCritical Mass\fP.
  308. +This manual page was written for the Debian GNU/Linux distribution
  309. +because the original program does not have a manual page.
  310. +.PP
  311. +.\" TeX users may be more comfortable with the \fB<whatever>\fP and
  312. +.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
  313. +.\" respectively.
  314. +\fBcriticalmass\fP is a space shootemup similar to Galaxian.  The basic idea
  315. +is simple: you move your ship back and forth at the bottom of the screen,
  316. +shooting up, while bad guys fly around and shoot down.
  317. +.PP
  318. +Additional documentation is available in
  319. +/usr/share/doc/criticalmass/Readme.html .
  320. +.SH OPTIONS
  321. +.TP
  322. +.B +fullscreen 0, +fullscreen 1
  323. +Run in windowed or in fullscreen mode, respectively.
  324. +.TP
  325. +.B +soundtrack FILE
  326. +Use the given file as a soundtrack.
  327. +.TP
  328. +.B +skill LEVEL
  329. +Start with the given skill level.  LEVEL must be one of "ROOKIE", "NORMAL",
  330. +"EXPERT", and "INSANE".
  331. +.SH SEE ALSO
  332. +/usr/share/doc/criticalmass/Readme.html
  333. +.br
  334. +.SH AUTHOR
  335. +Criticalmass was written by Frank Becker <crittermail2005 at telus dot net>
  336. +.PP
  337. +This manual page was written by Daniel Burrows <dburrows at debian dot org>,
  338. +for the Debian GNU/Linux system (but may be used by others).
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top