Changeset 2066 in orxonox.OLD for orxonox/branches/chris/src

Timestamp:

Jul 3, 2004, 5:36:35 PM (20 years ago)

Author:

chris

Message:

orxonox/branches/chris: Implemented CommandNode (Keyboard handling), created some functions to convert key names to identifyers and vice versa, ensured it compiles (when compiled spereately) added a header to hold global message structures

Location:

orxonox/branches/chris/src

Files:

• command_node.cc (added)
• command_node.h (added)
• ini_parser.cc (modified) (6 diffs)
• ini_parser.h (modified) (2 diffs)
• keynames.cc (added)
• keynames.h (added)
• message_structures.h (added)
• stdincl.h (modified) (1 diff)
• world_entity.h (modified) (2 diffs)

orxonox/branches/chris/src/ini_parser.cc

@@ -17 +17 @@
 #include "ini_parser.h"
 
-#include <stdio.h>
-#include <strings.h>
-
 using namespace std;
 
@@ -26 +23 @@
         stream = NULL;
         bInSection = false;
-        openFile (filename);
+        open_file (filename);
 }
 
@@ -34 +31 @@
 }
 
-int IniParser::openFile( char* filename)
+int IniParser::open_file( char* filename)
 {
         if( filename == NULL) return -1;
@@ -47 +44 @@
 }
 
-int IniParser::getSection( char* section)
+int IniParser::get_section( char* section)
 {
         bInSection = false;
@@ -80 +77 @@
 }
 
-int IniParser::nextVar( char* name, char* value)
+int IniParser::next_var( char* name, char* value)
 {
         if( stream == NULL)
@@ -114 +111 @@
 }
 
-char* IniParser::getVar( char* name, char* section, char* defvalue = "")
+char* IniParser::get_var( char* name, char* section, char* defvalue = "")
 {
         strcpy (internbuf, defvalue);
-        if( getSection (section) == -1) return internbuf;
+        if( get_section (section) == -1) return internbuf;
         
         char namebuf[PARSELINELENGHT];
         char valuebuf[PARSELINELENGHT];
         
-        while( nextVar (namebuf, valuebuf) != -1)
+        while( next_var (namebuf, valuebuf) != -1)
         {
                 if( !strcmp (name, namebuf))

orxonox/branches/chris/src/ini_parser.h

@@ -9 +9 @@
 #define INI_PARSER_H
 
-#include "stdincl.h"
+#include <stdio.h>
+#include <strings.h>
+#include <stdlib.h>
 
 #define PARSELINELENGHT 512
@@ -23 +25 @@
   ~IniParser ();
   
-  char* getVar( char* name, char* section, char* defvalue);
-        int openFile( char* name);
-  int getSection( char* section);
-  int nextVar( char* name, char* value);
+  char* get_var( char* name, char* section, char* defvalue);
+        int open_file( char* name);
+  int get_section( char* section);
+  int next_var( char* name, char* value);
 };
 

orxonox/branches/chris/src/stdincl.h

@@ -5 +5 @@
 #define null 0
 
+#ifdef __WIN32__
+#include <windows.h>
 #endif
+#include <SDL/SDL.h>
+
+#include "list.h"
+#include "message_structures.h"
+#include "orxonox.h"
+#include "world_entity.h"
+
+#endif

orxonox/branches/chris/src/world_entity.h

@@ -3 +3 @@
 #define WORLD_ENTITY_H
 
-#include "data_tank.h"
+#include "stdincl.h"
+//#include "data_tank.h"
 
 class Vector;
@@ -34 +35 @@
   virtual void hit(WorldEntity* weapon, Vector loc);
   virtual void destroy();
+  virtual void command (Command* cmd);
 
   virtual void entityPreEnter();