fixed some compile bugs with newer g++ versions

git-svn-id: https://svn.code.sf.net/p/gameservirc/code/trunk@466 bc333340-6410-0410-a689-9d09f3c113fa

diff --git a/gameserv/extern.h b/gameserv/extern.h
index af9cce68065692f0d4c3989a4bc2c7515decc400..7a31bc0cf1dc275400d6f05403d36b0209503c6f 100644 (file)
--- a/gameserv/extern.h
+++ b/gameserv/extern.h
@@ -15,6 +15,8 @@
 #include "config.h"
 #include "options.h"
 
+using std::list;
+using std::string;
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>

diff --git a/gameserv/player.h b/gameserv/player.h
index 1450a1396fe1c5d813bc7638267a54f7bd969aac..192577eff6b42f9b858afa3477bfaa53294a02f4 100644 (file)
--- a/gameserv/player.h
+++ b/gameserv/player.h
@@ -25,7 +25,7 @@ public:
   void setData(Player *);
 
   void reset();
-  friend script;
+  friend class script;
   
   long int getFlags() { return flags; };          // Returns the Client's current flags
   // Functions also return the flags after modifying them

diff --git a/gameserv/script.cpp b/gameserv/script.cpp
index f2b6c2c7504424283a4e86f40c04e63aa0155691..7055183ebc34ea7120e38ea90cac1a3a361755cb 100644 (file)
--- a/gameserv/script.cpp
+++ b/gameserv/script.cpp
@@ -63,11 +63,11 @@ bool script::executeScript(Player *p)
 
                  if (stricmp(left, "GOLD") == 0)
                        {
-                         (int*)leftptr = p->gold;
+                         leftptr = (void*)p->gold;
                        }
                  else if (stricmp(left, "STRENGTH") == 0)
                        {
-                         (int*)leftptr = p->strength;
+                         leftptr = (void*)p->strength;
                        }
                }