summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-10 19:26:56 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-10 19:26:56 +0000
commit045c123351a3ed8596799d57ae79165e76ed771a (patch)
tree5022a228eac1777297c752e49b6c0a65f3fe235a /src/common
parent269c643607bb5ef99141928971e6bac98e3095ed (diff)
downloadhercules-045c123351a3ed8596799d57ae79165e76ed771a.tar.gz
hercules-045c123351a3ed8596799d57ae79165e76ed771a.tar.bz2
hercules-045c123351a3ed8596799d57ae79165e76ed771a.tar.xz
hercules-045c123351a3ed8596799d57ae79165e76ed771a.zip
- Added a few dummy times in skill_cast_db for some GS skills.
- Autoskills now won't trigger on maps where said skill are not allowed. - Some compilation warning fixes git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5565 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
-rw-r--r--src/common/cbasetypes.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index 505eb6752..b84a0c88e 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -91,9 +91,14 @@ typedef int* pint;
//////////////////////////////
#ifdef WIN32
//////////////////////////////
+//These three are already redefined on my_global.h on Windows systems.
+#ifdef TXT_ONLY
typedef __int8 int8;
-typedef __int16 int16;
typedef __int32 int32;
+typedef unsigned __int32 uint32;
+#endif
+
+typedef __int16 int16;
typedef signed __int8 sint8;
typedef signed __int16 sint16;
@@ -101,7 +106,6 @@ typedef signed __int32 sint32;
typedef unsigned __int8 uint8;
typedef unsigned __int16 uint16;
-typedef unsigned __int32 uint32;
//////////////////////////////
#else // GNU
//////////////////////////////