Changeset 3994 in orxonox.OLD
- Timestamp:
- Apr 27, 2005, 1:50:23 PM (20 years ago)
- Location:
- orxonox/branches/ll2trunktemp/src
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/ll2trunktemp/src/Makefile.in
r3992 r3994 382 382 esac; \ 383 383 done; \ 384 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/Makefile'; \384 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ 385 385 cd $(top_srcdir) && \ 386 $(AUTOMAKE) -- gnusrc/Makefile386 $(AUTOMAKE) --foreign src/Makefile 387 387 .PRECIOUS: Makefile 388 388 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/branches/ll2trunktemp/src/factory.cc
r3940 r3994 45 45 Factory::~Factory () 46 46 { 47 47 //if( next != NULL) delete next; 48 48 } 49 49 -
orxonox/branches/ll2trunktemp/src/lib/Makefile.in
r3940 r3994 1 # Makefile.in generated by automake 1.8. 2from Makefile.am.1 # Makefile.in generated by automake 1.8.5 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 184 184 esac; \ 185 185 done; \ 186 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/Makefile'; \186 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/Makefile'; \ 187 187 cd $(top_srcdir) && \ 188 $(AUTOMAKE) -- gnusrc/lib/Makefile188 $(AUTOMAKE) --foreign src/lib/Makefile 189 189 .PRECIOUS: Makefile 190 190 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 279 279 tags=; \ 280 280 here=`pwd`; \ 281 if ( etags--etags-include --version) >/dev/null 2>&1; then \281 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ 282 282 include_option=--etags-include; \ 283 empty_fix=.; \ 283 284 else \ 284 285 include_option=--include; \ 286 empty_fix=; \ 285 287 fi; \ 286 288 list='$(SUBDIRS)'; for subdir in $$list; do \ 287 289 if test "$$subdir" = .; then :; else \ 288 test -f $$subdir/TAGS &&\290 test ! -f $$subdir/TAGS || \ 289 291 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ 290 292 fi; \ … … 296 298 $(AWK) ' { files[$$0] = 1; } \ 297 299 END { for (i in files) print i; }'`; \ 298 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 299 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 300 $$tags $$unique 300 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 301 test -n "$$unique" || unique=$$empty_fix; \ 302 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 303 $$tags $$unique; \ 304 fi 301 305 ctags: CTAGS 302 306 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -
orxonox/branches/ll2trunktemp/src/lib/graphics/Makefile.in
r3940 r3994 1 # Makefile.in generated by automake 1.8. 2from Makefile.am.1 # Makefile.in generated by automake 1.8.5 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 178 178 esac; \ 179 179 done; \ 180 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/graphics/Makefile'; \180 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/graphics/Makefile'; \ 181 181 cd $(top_srcdir) && \ 182 $(AUTOMAKE) -- gnusrc/lib/graphics/Makefile182 $(AUTOMAKE) --foreign src/lib/graphics/Makefile 183 183 .PRECIOUS: Makefile 184 184 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 273 273 tags=; \ 274 274 here=`pwd`; \ 275 if ( etags--etags-include --version) >/dev/null 2>&1; then \275 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ 276 276 include_option=--etags-include; \ 277 empty_fix=.; \ 277 278 else \ 278 279 include_option=--include; \ 280 empty_fix=; \ 279 281 fi; \ 280 282 list='$(SUBDIRS)'; for subdir in $$list; do \ 281 283 if test "$$subdir" = .; then :; else \ 282 test -f $$subdir/TAGS &&\284 test ! -f $$subdir/TAGS || \ 283 285 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ 284 286 fi; \ … … 290 292 $(AWK) ' { files[$$0] = 1; } \ 291 293 END { for (i in files) print i; }'`; \ 292 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 293 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 294 $$tags $$unique 294 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 295 test -n "$$unique" || unique=$$empty_fix; \ 296 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 297 $$tags $$unique; \ 298 fi 295 299 ctags: CTAGS 296 300 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -
orxonox/branches/ll2trunktemp/src/lib/graphics/importer/Makefile.in
r3940 r3994 1 # Makefile.in generated by automake 1.8. 2from Makefile.am.1 # Makefile.in generated by automake 1.8.5 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 42 42 subdir = src/lib/graphics/importer 43 43 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ 44 $(srcdir)/Makefile.in TODO44 $(srcdir)/Makefile.in 45 45 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 46 46 am__aclocal_m4_deps = $(top_srcdir)/configure.ac … … 50 50 CONFIG_HEADER = $(top_builddir)/config.h 51 51 CONFIG_CLEAN_FILES = 52 am__installdirs = $(DESTDIR)$(bindir)52 am__installdirs = "$(DESTDIR)$(bindir)" 53 53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 54 54 PROGRAMS = $(bin_PROGRAMS) … … 236 236 esac; \ 237 237 done; \ 238 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/graphics/importer/Makefile'; \238 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/graphics/importer/Makefile'; \ 239 239 cd $(top_srcdir) && \ 240 $(AUTOMAKE) -- gnusrc/lib/graphics/importer/Makefile240 $(AUTOMAKE) --foreign src/lib/graphics/importer/Makefile 241 241 .PRECIOUS: Makefile 242 242 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 258 258 install-binPROGRAMS: $(bin_PROGRAMS) 259 259 @$(NORMAL_INSTALL) 260 $(mkdir_p) $(DESTDIR)$(bindir)260 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" 261 261 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 262 262 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 264 264 ; then \ 265 265 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 266 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \267 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f|| exit 1; \266 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ 267 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ 268 268 else :; fi; \ 269 269 done … … 273 273 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 274 274 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 275 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \276 rm -f $(DESTDIR)$(bindir)/$$f; \275 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ 276 rm -f "$(DESTDIR)$(bindir)/$$f"; \ 277 277 done 278 278 … … 454 454 $(AWK) ' { files[$$0] = 1; } \ 455 455 END { for (i in files) print i; }'`; \ 456 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 457 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 458 $$tags $$unique 456 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 457 test -n "$$unique" || unique=$$empty_fix; \ 458 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 459 $$tags $$unique; \ 460 fi 459 461 ctags: CTAGS 460 462 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 511 513 all-am: Makefile $(PROGRAMS) $(HEADERS) 512 514 installdirs: 513 $(mkdir_p) $(DESTDIR)$(bindir) 515 for dir in "$(DESTDIR)$(bindir)"; do \ 516 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 517 done 514 518 install: install-am 515 519 install-exec: install-exec-am -
orxonox/branches/ll2trunktemp/src/lib/gui/Makefile.in
r3940 r3994 1 # Makefile.in generated by automake 1.8. 2from Makefile.am.1 # Makefile.in generated by automake 1.8.5 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 180 180 esac; \ 181 181 done; \ 182 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/gui/Makefile'; \182 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/gui/Makefile'; \ 183 183 cd $(top_srcdir) && \ 184 $(AUTOMAKE) -- gnusrc/lib/gui/Makefile184 $(AUTOMAKE) --foreign src/lib/gui/Makefile 185 185 .PRECIOUS: Makefile 186 186 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 275 275 tags=; \ 276 276 here=`pwd`; \ 277 if ( etags--etags-include --version) >/dev/null 2>&1; then \277 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ 278 278 include_option=--etags-include; \ 279 empty_fix=.; \ 279 280 else \ 280 281 include_option=--include; \ 282 empty_fix=; \ 281 283 fi; \ 282 284 list='$(SUBDIRS)'; for subdir in $$list; do \ 283 285 if test "$$subdir" = .; then :; else \ 284 test -f $$subdir/TAGS &&\286 test ! -f $$subdir/TAGS || \ 285 287 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ 286 288 fi; \ … … 292 294 $(AWK) ' { files[$$0] = 1; } \ 293 295 END { for (i in files) print i; }'`; \ 294 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 295 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 296 $$tags $$unique 296 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 297 test -n "$$unique" || unique=$$empty_fix; \ 298 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 299 $$tags $$unique; \ 300 fi 297 301 ctags: CTAGS 298 302 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -
orxonox/branches/ll2trunktemp/src/lib/gui/console/Makefile.in
r3940 r3994 1 # Makefile.in generated by automake 1.8. 2from Makefile.am.1 # Makefile.in generated by automake 1.8.5 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 50 50 CONFIG_HEADER = $(top_builddir)/config.h 51 51 CONFIG_CLEAN_FILES = 52 am__installdirs = $(DESTDIR)$(bindir)52 am__installdirs = "$(DESTDIR)$(bindir)" 53 53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 54 54 PROGRAMS = $(bin_PROGRAMS) … … 206 206 esac; \ 207 207 done; \ 208 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/gui/console/Makefile'; \208 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/gui/console/Makefile'; \ 209 209 cd $(top_srcdir) && \ 210 $(AUTOMAKE) -- gnusrc/lib/gui/console/Makefile210 $(AUTOMAKE) --foreign src/lib/gui/console/Makefile 211 211 .PRECIOUS: Makefile 212 212 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 228 228 install-binPROGRAMS: $(bin_PROGRAMS) 229 229 @$(NORMAL_INSTALL) 230 $(mkdir_p) $(DESTDIR)$(bindir)230 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" 231 231 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 232 232 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 234 234 ; then \ 235 235 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 236 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \237 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f|| exit 1; \236 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ 237 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ 238 238 else :; fi; \ 239 239 done … … 243 243 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 244 244 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 245 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \246 rm -f $(DESTDIR)$(bindir)/$$f; \245 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ 246 rm -f "$(DESTDIR)$(bindir)/$$f"; \ 247 247 done 248 248 … … 300 300 $(AWK) ' { files[$$0] = 1; } \ 301 301 END { for (i in files) print i; }'`; \ 302 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 303 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 304 $$tags $$unique 302 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 303 test -n "$$unique" || unique=$$empty_fix; \ 304 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 305 $$tags $$unique; \ 306 fi 305 307 ctags: CTAGS 306 308 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 357 359 all-am: Makefile $(PROGRAMS) $(HEADERS) 358 360 installdirs: 359 $(mkdir_p) $(DESTDIR)$(bindir) 361 for dir in "$(DESTDIR)$(bindir)"; do \ 362 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 363 done 360 364 install: install-am 361 365 install-exec: install-exec-am -
orxonox/branches/ll2trunktemp/src/lib/gui/gui/Makefile.in
r3940 r3994 1 # Makefile.in generated by automake 1.8. 2from Makefile.am.1 # Makefile.in generated by automake 1.8.5 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 50 50 CONFIG_HEADER = $(top_builddir)/config.h 51 51 CONFIG_CLEAN_FILES = 52 am__installdirs = $(DESTDIR)$(bindir)52 am__installdirs = "$(DESTDIR)$(bindir)" 53 53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 54 54 PROGRAMS = $(bin_PROGRAMS) … … 240 240 esac; \ 241 241 done; \ 242 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/gui/gui/Makefile'; \242 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/gui/gui/Makefile'; \ 243 243 cd $(top_srcdir) && \ 244 $(AUTOMAKE) -- gnusrc/lib/gui/gui/Makefile244 $(AUTOMAKE) --foreign src/lib/gui/gui/Makefile 245 245 .PRECIOUS: Makefile 246 246 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 262 262 install-binPROGRAMS: $(bin_PROGRAMS) 263 263 @$(NORMAL_INSTALL) 264 $(mkdir_p) $(DESTDIR)$(bindir)264 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" 265 265 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 266 266 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 268 268 ; then \ 269 269 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 270 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \271 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f|| exit 1; \270 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ 271 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ 272 272 else :; fi; \ 273 273 done … … 277 277 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 278 278 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 279 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \280 rm -f $(DESTDIR)$(bindir)/$$f; \279 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ 280 rm -f "$(DESTDIR)$(bindir)/$$f"; \ 281 281 done 282 282 … … 340 340 $(AWK) ' { files[$$0] = 1; } \ 341 341 END { for (i in files) print i; }'`; \ 342 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 343 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 344 $$tags $$unique 342 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 343 test -n "$$unique" || unique=$$empty_fix; \ 344 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 345 $$tags $$unique; \ 346 fi 345 347 ctags: CTAGS 346 348 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 397 399 all-am: Makefile $(PROGRAMS) $(HEADERS) 398 400 installdirs: 399 $(mkdir_p) $(DESTDIR)$(bindir) 401 for dir in "$(DESTDIR)$(bindir)"; do \ 402 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 403 done 400 404 install: install-am 401 405 install-exec: install-exec-am -
orxonox/branches/ll2trunktemp/src/story_entities/campaign.cc
r3989 r3994 37 37 Campaign::Campaign ( TiXmlElement* root) 38 38 { 39 40 41 42 43 44 45 46 47 39 TiXmlElement* element; 40 const char* string; 41 int id; 42 43 PRINTF0("Loading Campaign...\n"); 44 45 assert( root != NULL); 46 GameLoader* loader = GameLoader::getInstance(); 47 48 48 this->entities = new tList<StoryEntity>(); 49 49 this->isInit = false; 50 50 51 51 // grab all the necessary parameters 52 53 54 55 56 57 58 52 string = grabParameter( root, "identifier"); 53 if( string == NULL || sscanf(string, "%d", &id) != 1) 54 { 55 PRINTF0("Campaign is missing a proper 'identifier'\n"); 56 this->setStoryID( -1); 57 } 58 else this->setStoryID( id); 59 59 60 60 // find WorldList 61 61 element = root->FirstChildElement( "WorldList"); 62 62 if( element == NULL) 63 {64 65 }63 { 64 PRINTF0("Campaign is missing a proper 'WorldList'\n"); 65 } 66 66 else 67 67 element = element->FirstChildElement(); 68 68 69 69 // load Worlds/Subcampaigns/Whatever 70 70 StoryEntity* lastCreated = NULL; 71 while( element != NULL) 72 { 73 StoryEntity* created = (StoryEntity*) loader->fabricate( element); 74 if( lastCreated != NULL) created->setNextStoryID( lastCreated->getStoryID()); 75 if( created != NULL) 76 { 77 this->addEntity( created); 78 lastCreated = created; 79 } 80 element = element->NextSiblingElement(); 81 } 82 if( lastCreated != NULL) lastCreated->setStoryID( WORLD_ID_GAMEEND); 71 while( element != NULL) 72 { 73 printf("Campaign: Constructor: adding a world\n"); 74 StoryEntity* created = (StoryEntity*) loader->fabricate( element); 75 /* 76 if( lastCreated != NULL) 77 created->setNextStoryID( lastCreated->getStoryID()); 78 else 79 created->setNextStoryID( WORLD_ID_GAMEEND); 80 */ 81 if( created != NULL) 82 { 83 this->addEntity( created); 84 lastCreated = created; 85 } 86 element = element->NextSiblingElement(); 87 } 88 //if( lastCreated != NULL) 89 //lastCreated->setStoryID( WORLD_ID_GAMEEND); 83 90 } 84 91 -
orxonox/branches/ll2trunktemp/src/story_entities/world.cc
r3992 r3994 120 120 this->constuctorInit("", -1); 121 121 122 const char *string; 123 char *name; 124 int id; 125 126 PRINTF0("Creating a World\n"); 127 128 // identifier 129 string = grabParameter( root, "identifier"); 130 if( string == NULL || sscanf(string, "%d", &id) != 1) 131 { 132 PRINTF0("World is missing a proper 'identifier'\n"); 133 this->setStoryID( -1); 134 } 135 else setStoryID( id); 136 137 // path 138 string = grabParameter( root, "path"); 139 if( string == NULL) 140 { 141 PRINTF0("World is missing a proper 'path'\n"); 142 this->setPath( NULL); 143 } 144 else 145 { 146 name = new char[strlen(string + 2)]; 147 strcpy( name, string); 148 this->setPath( name); 149 } 122 const char *string; 123 char *name; 124 int id; 125 126 PRINTF0("Creating a World\n"); 127 128 // identifier 129 string = grabParameter( root, "identifier"); 130 if( string == NULL || sscanf(string, "%d", &id) != 1) 131 { 132 PRINTF0("World is missing a proper 'identifier'\n"); 133 this->setStoryID( -1); 134 } 135 else setStoryID( id); 136 137 // next id 138 string = grabParameter( root, "nextid"); 139 if( string == NULL || sscanf(string, "%d", &id) != 1) 140 { 141 PRINTF0("World is missing a proper 'nextid'\n"); 142 this->setStoryID( -1); 143 } 144 else setNextStoryID( id); 145 146 147 // path 148 string = grabParameter( root, "path"); 149 if( string == NULL) 150 { 151 PRINTF0("World is missing a proper 'path'\n"); 152 this->setPath( NULL); 153 } 154 else 155 { 156 name = new char[strlen(string + 2)]; 157 strcpy( name, string); 158 this->setPath( name); 159 } 150 160 151 161 this->localPlayer = NULL; -
orxonox/branches/ll2trunktemp/src/subprojects/Makefile.in
r3940 r3994 1 # Makefile.in generated by automake 1.8. 2from Makefile.am.1 # Makefile.in generated by automake 1.8.5 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 178 178 esac; \ 179 179 done; \ 180 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/subprojects/Makefile'; \180 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/subprojects/Makefile'; \ 181 181 cd $(top_srcdir) && \ 182 $(AUTOMAKE) -- gnusrc/subprojects/Makefile182 $(AUTOMAKE) --foreign src/subprojects/Makefile 183 183 .PRECIOUS: Makefile 184 184 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 273 273 tags=; \ 274 274 here=`pwd`; \ 275 if ( etags--etags-include --version) >/dev/null 2>&1; then \275 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ 276 276 include_option=--etags-include; \ 277 empty_fix=.; \ 277 278 else \ 278 279 include_option=--include; \ 280 empty_fix=; \ 279 281 fi; \ 280 282 list='$(SUBDIRS)'; for subdir in $$list; do \ 281 283 if test "$$subdir" = .; then :; else \ 282 test -f $$subdir/TAGS &&\284 test ! -f $$subdir/TAGS || \ 283 285 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ 284 286 fi; \ … … 290 292 $(AWK) ' { files[$$0] = 1; } \ 291 293 END { for (i in files) print i; }'`; \ 292 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 293 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 294 $$tags $$unique 294 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 295 test -n "$$unique" || unique=$$empty_fix; \ 296 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 297 $$tags $$unique; \ 298 fi 295 299 ctags: CTAGS 296 300 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -
orxonox/branches/ll2trunktemp/src/subprojects/testmain/Makefile.in
r3940 r3994 1 # Makefile.in generated by automake 1.8. 2from Makefile.am.1 # Makefile.in generated by automake 1.8.5 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 50 50 CONFIG_HEADER = $(top_builddir)/config.h 51 51 CONFIG_CLEAN_FILES = 52 am__installdirs = $(DESTDIR)$(bindir)52 am__installdirs = "$(DESTDIR)$(bindir)" 53 53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 54 54 PROGRAMS = $(bin_PROGRAMS) … … 198 198 esac; \ 199 199 done; \ 200 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/subprojects/testmain/Makefile'; \200 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/subprojects/testmain/Makefile'; \ 201 201 cd $(top_srcdir) && \ 202 $(AUTOMAKE) -- gnusrc/subprojects/testmain/Makefile202 $(AUTOMAKE) --foreign src/subprojects/testmain/Makefile 203 203 .PRECIOUS: Makefile 204 204 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 220 220 install-binPROGRAMS: $(bin_PROGRAMS) 221 221 @$(NORMAL_INSTALL) 222 $(mkdir_p) $(DESTDIR)$(bindir)222 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" 223 223 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 224 224 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 226 226 ; then \ 227 227 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 228 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \229 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f|| exit 1; \228 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ 229 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ 230 230 else :; fi; \ 231 231 done … … 235 235 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 236 236 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 237 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \238 rm -f $(DESTDIR)$(bindir)/$$f; \237 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ 238 rm -f "$(DESTDIR)$(bindir)/$$f"; \ 239 239 done 240 240 … … 290 290 $(AWK) ' { files[$$0] = 1; } \ 291 291 END { for (i in files) print i; }'`; \ 292 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 293 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 294 $$tags $$unique 292 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 293 test -n "$$unique" || unique=$$empty_fix; \ 294 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 295 $$tags $$unique; \ 296 fi 295 297 ctags: CTAGS 296 298 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 347 349 all-am: Makefile $(PROGRAMS) $(HEADERS) 348 350 installdirs: 349 $(mkdir_p) $(DESTDIR)$(bindir) 351 for dir in "$(DESTDIR)$(bindir)"; do \ 352 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 353 done 350 354 install: install-am 351 355 install-exec: install-exec-am
Note: See TracChangeset
for help on using the changeset viewer.