summaryrefslogtreecommitdiff
path: root/src/npc.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-26 22:22:22 +0100
committerIra Rice <irarice@gmail.com>2009-03-05 17:22:19 -0700
commit448d9076137fc5dde666a90820992a34a945cbf7 (patch)
treeee8d478fbced980a0ea868e9a7810ca56c49fe97 /src/npc.h
parenta79d05b01d4a2dc639e6d3a5b7ddd508e64d3511 (diff)
downloadmana-448d9076137fc5dde666a90820992a34a945cbf7.tar.gz
mana-448d9076137fc5dde666a90820992a34a945cbf7.tar.bz2
mana-448d9076137fc5dde666a90820992a34a945cbf7.tar.xz
mana-448d9076137fc5dde666a90820992a34a945cbf7.zip
Got rid of Sint{8,16,32} and Uint32 for being ID
Using unsigned rarely makes sense, especially when the server doesn't use it either. Other uses of unsigned should be reviewed. In all other cases, int is the fastest integer type on any architecture. Using 8 or 16 bits can basically only be a memory optimization.
Diffstat (limited to 'src/npc.h')
-rw-r--r--src/npc.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/npc.h b/src/npc.h
index e1bf9737..137cd5f5 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -23,8 +23,6 @@
#ifndef NPC_H
#define NPC_H
-#include <SDL_types.h>
-
#include "player.h"
class Network;
@@ -34,7 +32,7 @@ class Text;
class NPC : public Player
{
public:
- NPC(Uint32 id, Uint16 job, Map *map, Network *network);
+ NPC(int id, Uint16 job, Map *map, Network *network);
~NPC();
@@ -55,6 +53,6 @@ class NPC : public Player
Text *mName;
};
-extern Uint32 current_npc;
+extern int current_npc;
#endif