| 1 |
diff -up CriticalMass-1.0.2/game/Makefile.in~ CriticalMass-1.0.2/game/Makefile.in
|
| 2 |
--- CriticalMass-1.0.2/game/Makefile.in~ 2007-11-30 22:01:35.000000000 +0100
|
| 3 |
+++ CriticalMass-1.0.2/game/Makefile.in 2007-11-30 22:01:35.000000000 +0100
|
| 4 |
@@ -73,7 +73,7 @@ critter_LDADD = $(LDADD)
|
| 5 |
@WIN32_TRUE@am__DEPENDENCIES_1 = critter.res
|
| 6 |
critter_DEPENDENCIES = ../utils/libutils.a \
|
| 7 |
../utilssdl/libutilssdl.a ../utilsgl/libutilsgl.a \
|
| 8 |
- ../tinyxml/libtinyxml.a $(am__DEPENDENCIES_1)
|
| 9 |
+ $(am__DEPENDENCIES_1)
|
| 10 |
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
| 11 |
depcomp =
|
| 12 |
am__depfiles_maybe =
|
| 13 |
@@ -233,8 +233,8 @@ critter_SOURCES = \
|
| 14 |
|
| 15 |
LDADD = ../utils/libutils.a -lcurl \
|
| 16 |
../utilssdl/libutilssdl.a ../utilsgl/libutilsgl.a \
|
| 17 |
- ../tinyxml/libtinyxml.a $(am__append_1)
|
| 18 |
-@APPLE_FALSE@@WIN32_FALSE@INCLUDES = -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\"
|
| 19 |
+ -ltinyxml $(am__append_1)
|
| 20 |
+@APPLE_FALSE@@WIN32_FALSE@INCLUDES = -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\"
|
| 21 |
@APPLE_TRUE@@WIN32_FALSE@INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"/Contents/Resources/\"
|
| 22 |
@WIN32_TRUE@INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"./\"
|
| 23 |
@WIN32_FALSE@pkgdata_DATA = resource.dat
|
| 24 |
diff -up CriticalMass-1.0.2/game/Makefile.am~ CriticalMass-1.0.2/game/Makefile.am
|
| 25 |
--- CriticalMass-1.0.2/game/Makefile.am~ 2007-11-30 22:02:50.000000000 +0100
|
| 26 |
+++ CriticalMass-1.0.2/game/Makefile.am 2007-11-30 22:02:50.000000000 +0100
|
| 27 |
@@ -45,7 +45,7 @@ LDADD = \
|
| 28 |
../utils/libutils.a \
|
| 29 |
../utilssdl/libutilssdl.a \
|
| 30 |
../utilsgl/libutilsgl.a \
|
| 31 |
- ../tinyxml/libtinyxml.a
|
| 32 |
+ -ltinyxml
|
| 33 |
|
| 34 |
if WIN32
|
| 35 |
INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"./\"
|
| 36 |
@@ -55,7 +55,7 @@ else
|
| 37 |
if APPLE
|
| 38 |
INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"/Contents/Resources/\"
|
| 39 |
else
|
| 40 |
-INCLUDES = -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\"
|
| 41 |
+INCLUDES = -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\"
|
| 42 |
endif
|
| 43 |
|
| 44 |
endif
|
| 45 |
diff -up CriticalMass-1.0.2/Makefile.in~ CriticalMass-1.0.2/Makefile.in
|
| 46 |
--- CriticalMass-1.0.2/Makefile.in~ 2007-11-30 22:12:35.000000000 +0100
|
| 47 |
+++ CriticalMass-1.0.2/Makefile.in 2007-11-30 22:12:35.000000000 +0100
|
| 48 |
@@ -178,7 +178,7 @@ target_vendor = @target_vendor@
|
| 49 |
|
| 50 |
# require automake 1.4
|
| 51 |
AUTOMAKE_OPTIONS = 1.4
|
| 52 |
-SUBDIRS = tinyxml utils utilssdl utilsgl tools data game
|
| 53 |
+SUBDIRS = utils utilssdl utilsgl tools data game
|
| 54 |
DIST_SUBDIRS = $(SUBDIRS)
|
| 55 |
man_MANS = critter.6
|
| 56 |
EXTRA_DIST = $(man_MANS)
|
| 57 |
diff -up CriticalMass-1.0.2/Makefile.am~ CriticalMass-1.0.2/Makefile.am
|
| 58 |
--- CriticalMass-1.0.2/Makefile.am~ 2007-11-30 22:12:42.000000000 +0100
|
| 59 |
+++ CriticalMass-1.0.2/Makefile.am 2007-11-30 22:12:42.000000000 +0100
|
| 60 |
@@ -4,7 +4,7 @@
|
| 61 |
AUTOMAKE_OPTIONS = 1.4
|
| 62 |
|
| 63 |
## Any directories that you want built and installed should go here.
|
| 64 |
-SUBDIRS = tinyxml utils utilssdl utilsgl tools data game
|
| 65 |
+SUBDIRS = utils utilssdl utilsgl tools data game
|
| 66 |
|
| 67 |
## Any directories you want a part of the distribution should be listed
|
| 68 |
## here, as well as have a Makefile generated at the end of configure.in
|
| 69 |
diff -up CriticalMass-1.0.2/game/EnemyFactory.cpp~ CriticalMass-1.0.2/game/EnemyFactory.cpp
|
| 70 |
--- CriticalMass-1.0.2/game/EnemyFactory.cpp~ 2007-12-01 11:09:42.000000000 +0100
|
| 71 |
+++ CriticalMass-1.0.2/game/EnemyFactory.cpp 2007-12-01 11:09:42.000000000 +0100
|
| 72 |
@@ -59,10 +59,10 @@ void EnemyFactory::createEnemy( TiXmlNod
|
| 73 |
LEnemy *enemy = new LEnemy();
|
| 74 |
|
| 75 |
elem = enemyNode->ToElement();
|
| 76 |
- enemy->spawnTime = strToFloat( *elem->Attribute("spawnTime"));
|
| 77 |
+ enemy->spawnTime = strToFloat(elem->Attribute("spawnTime"));
|
| 78 |
EnemyType enemyType = eSimpleEnemy;
|
| 79 |
if( elem->Attribute("type"))
|
| 80 |
- enemyType = (EnemyType)strToInt(*elem->Attribute("type"));
|
| 81 |
+ enemyType = (EnemyType)strToInt(elem->Attribute("type"));
|
| 82 |
|
| 83 |
node = enemyNode->FirstChild("Model");
|
| 84 |
elem = node->ToElement();
|
| 85 |
@@ -66,27 +66,27 @@ void EnemyFactory::createEnemy( TiXmlNod
|
| 86 |
|
| 87 |
node = enemyNode->FirstChild("Model");
|
| 88 |
elem = node->ToElement();
|
| 89 |
- enemy->modelName = *elem->Attribute("Name");
|
| 90 |
+ enemy->modelName = elem->Attribute("Name");
|
| 91 |
|
| 92 |
node = enemyNode->FirstChild("SpawnPoint");
|
| 93 |
elem = node->ToElement();
|
| 94 |
- enemy->spawnPoint.x = strToFloat( *elem->Attribute("x"));
|
| 95 |
- enemy->spawnPoint.y = strToFloat( *elem->Attribute("y"));
|
| 96 |
- enemy->spawnPoint.z = strToFloat( *elem->Attribute("z"));
|
| 97 |
+ enemy->spawnPoint.x = strToFloat(elem->Attribute("x"));
|
| 98 |
+ enemy->spawnPoint.y = strToFloat(elem->Attribute("y"));
|
| 99 |
+ enemy->spawnPoint.z = strToFloat(elem->Attribute("z"));
|
| 100 |
|
| 101 |
node = enemyNode->FirstChild("Home");
|
| 102 |
elem = node->ToElement();
|
| 103 |
- enemy->home.x = strToFloat( *elem->Attribute("x"));
|
| 104 |
- enemy->home.y = strToFloat( *elem->Attribute("y"));
|
| 105 |
- enemy->home.z = strToFloat( *elem->Attribute("z"));
|
| 106 |
+ enemy->home.x = strToFloat(elem->Attribute("x"));
|
| 107 |
+ enemy->home.y = strToFloat(elem->Attribute("y"));
|
| 108 |
+ enemy->home.z = strToFloat(elem->Attribute("z"));
|
| 109 |
|
| 110 |
node = enemyNode->FirstChild("EntryPath");
|
| 111 |
elem = node->ToElement();
|
| 112 |
- enemy->entry = lpm.getPath( *elem->Attribute("Name"));
|
| 113 |
+ enemy->entry = lpm.getPath(elem->Attribute("Name"));
|
| 114 |
|
| 115 |
node = enemyNode->FirstChild("IdlePath");
|
| 116 |
elem = node->ToElement();
|
| 117 |
- enemy->idle = lpm.getPath( *elem->Attribute("Name"));
|
| 118 |
+ enemy->idle = lpm.getPath(elem->Attribute("Name"));
|
| 119 |
|
| 120 |
node = enemyNode->FirstChild("AttackPath");
|
| 121 |
enemy->numAttackPaths = countSiblings( node, "AttackPath");
|
| 122 |
@@ -94,7 +94,7 @@ void EnemyFactory::createEnemy( TiXmlNod
|
| 123 |
for( int i=0; i< enemy->numAttackPaths; i++)
|
| 124 |
{
|
| 125 |
elem = node->ToElement();
|
| 126 |
- enemy->attack[ i] = lpm.getPath( *elem->Attribute("Name"));
|
| 127 |
+ enemy->attack[ i] = lpm.getPath(elem->Attribute("Name"));
|
| 128 |
node = node->NextSibling( "AttackPath");
|
| 129 |
}
|
| 130 |
|
| 131 |
@@ -104,7 +104,7 @@ void EnemyFactory::createEnemy( TiXmlNod
|
| 132 |
for( int i=0; i< enemy->numRetreatPaths; i++)
|
| 133 |
{
|
| 134 |
elem = node->ToElement();
|
| 135 |
- enemy->retreat[ i] = lpm.getPath( *elem->Attribute("Name"));
|
| 136 |
+ enemy->retreat[ i] = lpm.getPath(elem->Attribute("Name"));
|
| 137 |
node = node->NextSibling( "RetreatPath");
|
| 138 |
}
|
| 139 |
|
| 140 |
diff -up CriticalMass-1.0.2/game/OnlineUpdate.cpp~ CriticalMass-1.0.2/game/OnlineUpdate.cpp
|
| 141 |
--- CriticalMass-1.0.2/game/OnlineUpdate.cpp~ 2007-12-01 11:16:51.000000000 +0100
|
| 142 |
+++ CriticalMass-1.0.2/game/OnlineUpdate.cpp 2007-12-01 11:16:51.000000000 +0100
|
| 143 |
@@ -216,8 +216,8 @@ bool OnlineUpdate::process( void)
|
| 144 |
while( node)
|
| 145 |
{
|
| 146 |
TiXmlElement *element = node->ToElement();
|
| 147 |
- const string *name = element->Attribute("Name");
|
| 148 |
- if( name && (*name == GAMETITLE))
|
| 149 |
+ const char *name = element->Attribute("Name");
|
| 150 |
+ if( name && (name == GAMETITLE))
|
| 151 |
{
|
| 152 |
// LOG_INFO << "Found " << GAMETITLE << " update section\n";
|
| 153 |
TiXmlNode *release = node->FirstChild( "Release");
|
| 154 |
@@ -228,18 +228,18 @@ bool OnlineUpdate::process( void)
|
| 155 |
while( release)
|
| 156 |
{
|
| 157 |
element = release->ToElement();
|
| 158 |
- const string *version = element->Attribute("Version");
|
| 159 |
- const string *date = element->Attribute("Date");
|
| 160 |
+ const char *version = element->Attribute("Version");
|
| 161 |
+ const char *date = element->Attribute("Date");
|
| 162 |
if( version && date)
|
| 163 |
{
|
| 164 |
-// LOG_INFO << "Version " << *version << " released on " << *date << endl;
|
| 165 |
+// LOG_INFO << "Version " << version << " released on " << *date << endl;
|
| 166 |
|
| 167 |
- int versionID = getVersionID(*version);
|
| 168 |
+ int versionID = getVersionID(version);
|
| 169 |
if( versionID > latestVersionID)
|
| 170 |
{
|
| 171 |
latestVersionID = versionID;
|
| 172 |
- _latestVersion = *version;
|
| 173 |
- _latestVersionDate = *date;
|
| 174 |
+ _latestVersion = version;
|
| 175 |
+ _latestVersionDate = date;
|
| 176 |
TiXmlNode *body = release->FirstChild( "Body");
|
| 177 |
if( body)
|
| 178 |
{
|
| 179 |
@@ -292,8 +292,8 @@ bool OnlineUpdate::process( void)
|
| 180 |
while( node)
|
| 181 |
{
|
| 182 |
TiXmlElement *element = node->ToElement();
|
| 183 |
- const string *title = element->Attribute("Title");
|
| 184 |
- const string *date = element->Attribute("Date");
|
| 185 |
+ const char *title = element->Attribute("Title");
|
| 186 |
+ const char *date = element->Attribute("Date");
|
| 187 |
if( title && date)
|
| 188 |
{
|
| 189 |
TiXmlNode *body = element->FirstChild( "Body");
|
| 190 |
@@ -303,8 +303,8 @@ bool OnlineUpdate::process( void)
|
| 191 |
if( leaf)
|
| 192 |
{
|
| 193 |
NewsItem *newsItem = new NewsItem;
|
| 194 |
- newsItem->title = *title;
|
| 195 |
- newsItem->date = *date;
|
| 196 |
+ newsItem->title = title;
|
| 197 |
+ newsItem->date = date;
|
| 198 |
newsItem->text = leaf->Value();
|
| 199 |
newsItem->r = 1.0;
|
| 200 |
newsItem->g = 1.0;
|
| 201 |
diff -up CriticalMass-1.0.2/game/MenuManager.cpp~ CriticalMass-1.0.2/game/MenuManager.cpp
|
| 202 |
--- CriticalMass-1.0.2/game/MenuManager.cpp~ 2007-12-01 11:10:55.000000000 +0100
|
| 203 |
+++ CriticalMass-1.0.2/game/MenuManager.cpp 2007-12-01 11:10:55.000000000 +0100
|
| 204 |
@@ -305,13 +305,13 @@ bool MenuManager::draw( void)
|
| 205 |
glDisable(GL_TEXTURE_2D);
|
| 206 |
|
| 207 |
TiXmlElement* elem = _currentMenu->ToElement();
|
| 208 |
- const string* val = elem->Attribute("Text");
|
| 209 |
+ const char* val = elem->Attribute("Text");
|
| 210 |
if( val)
|
| 211 |
{
|
| 212 |
GLBitmapFont &fontWhite =
|
| 213 |
*(FontManagerS::instance()->getFont( "bitmaps/menuWhite"));
|
| 214 |
glColor4f(1.0, 1.0, 1.0, 1.0);
|
| 215 |
- fontWhite.DrawString( (*val).c_str(), 122, 527, 0.5, 0.5);
|
| 216 |
+ fontWhite.DrawString(val, 122, 527, 0.5, 0.5);
|
| 217 |
}
|
| 218 |
|
| 219 |
list<Selectable*>::iterator i;
|
| 220 |
diff -up CriticalMass-1.0.2/game/StageManager.cpp~ CriticalMass-1.0.2/game/StageManager.cpp
|
| 221 |
--- CriticalMass-1.0.2/game/StageManager.cpp~ 2007-12-01 12:05:46.000000000 +0100
|
| 222 |
+++ CriticalMass-1.0.2/game/StageManager.cpp 2007-12-01 12:05:46.000000000 +0100
|
| 223 |
@@ -162,9 +162,9 @@ bool StageManager::activateLevel( void)
|
| 224 |
#endif
|
| 225 |
|
| 226 |
TiXmlElement* levelNode = _activeLevel->ToElement();
|
| 227 |
- _activeLevelName = *levelNode->Attribute("Name");
|
| 228 |
+ _activeLevelName = levelNode->Attribute("Name");
|
| 229 |
LOG_INFO << "Level '" << _activeLevelName
|
| 230 |
- << "' by " << *levelNode->Attribute("Author") << endl;
|
| 231 |
+ << "' by " << levelNode->Attribute("Author") << endl;
|
| 232 |
|
| 233 |
static ParticleGroup *effects =
|
| 234 |
ParticleGroupManagerS::instance()->getParticleGroup( EFFECTS_GROUP2);
|
Parent Directory
| 
Revision Log