Changeset 346 for code/branches/FICN/src/network/GameStateManager.cc

Timestamp:

Nov 29, 2007, 4:21:30 PM (17 years ago)

Author:

rgrieder

Message:

• adjusted the entire source to compile under windows visual studio too:
• added some ugly conversions
• changed some illegal code pieces (gcc however accepted it)
• added a few files from reto's framework to evade linker errors (no more dynamic linking)
• inserted some 'return true' to justify the return type
• excluded the levelLoader in the orxonox.cc (couldn't make it work, parsing error)
• wrote about 5 code #branches to compensate for missing usleep() under windows

Location:

code/branches/FICN

Files:

• . (modified) (1 prop)
• src/network/GameStateManager.cc (modified) (2 diffs)

code/branches/FICN/src/network/GameStateManager.cc

@@ -106 +106 @@
   }
   
-  
+  return true;
 }
 
@@ -115 +115 @@
  */
 // orxonox::Iterator<Synchronisable> removeObject(orxonox::Iterator<Synchronisable> it){
-void removeObject(orxonox::Iterator<Synchronisable> &it){
+void GameStateManager::removeObject(orxonox::Iterator<Synchronisable> &it){
   orxonox::Iterator<Synchronisable> temp=it;
   ++it;