diff options
| author | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-23 07:08:31 +0000 |
|---|---|---|
| committer | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-23 07:08:31 +0000 |
| commit | d8c2f065493f2daca894ef9662efb1017ab370e2 (patch) | |
| tree | 638c35ff342ba5c89e2b920211091a88b0b2b6cd | |
| parent | bc3de5fb5ea98691dc48e6984c5e5a2e9ebf7b36 (diff) | |
| download | hercules-d8c2f065493f2daca894ef9662efb1017ab370e2.tar.gz hercules-d8c2f065493f2daca894ef9662efb1017ab370e2.tar.bz2 hercules-d8c2f065493f2daca894ef9662efb1017ab370e2.tar.xz hercules-d8c2f065493f2daca894ef9662efb1017ab370e2.zip | |
* Minor cleanups.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5712 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/map/script.c | 2 | ||||
| -rw-r--r-- | src/map/unit.c | 2 | ||||
| -rw-r--r-- | src/map/unit.h | 2 | ||||
| -rw-r--r-- | vcproj-7.1/map-server_sql.vcproj | 6 | ||||
| -rw-r--r-- | vcproj-7.1/map-server_txt.vcproj | 6 |
6 files changed, 18 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index b9f74eeab..88d681974 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EVERYTHING ELSE
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
+2006/03/23
+ * Minor cleanups. [Lance]
+
2006/03/22
* Fixed function pc_isCardAllowedOn causing searches for non-existant item
id 0. [Skotlex]
diff --git a/src/map/script.c b/src/map/script.c index 3226a6b2f..70941e7ea 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -10244,7 +10244,7 @@ int buildin_setmobdata(struct script_state *st){ md->db->shield = (short)value;
break;
case 23:
- md->ud.dir = (short)value;
+ md->ud.dir = (unsigned char)value;
break;
default:
ShowError("buildin_setmobdata: argument id is not identified.");
diff --git a/src/map/unit.c b/src/map/unit.c index c38e7fa6f..4280f9662 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -366,7 +366,7 @@ int unit_movepos(struct block_list *bl,int dst_x,int dst_y, int easy, int checkp return 1;
}
-int unit_setdir(struct block_list *bl,unsigned short dir)
+int unit_setdir(struct block_list *bl,unsigned char dir)
{
struct unit_data *ud;
nullpo_retr( 0, bl );
diff --git a/src/map/unit.h b/src/map/unit.h index d711f19c8..9724a8523 100644 --- a/src/map/unit.h +++ b/src/map/unit.h @@ -27,7 +27,7 @@ int unit_walkdelay(struct block_list *bl, unsigned int tick, int adelay, int del // 位置の強制移動(吹き飛ばしなど)
int unit_movepos(struct block_list *bl,int dst_x,int dst_y, int easy, int checkpath);
int unit_warp(struct block_list *bl, int map, int x, int y, int type);
-int unit_setdir(struct block_list *bl,unsigned short dir);
+int unit_setdir(struct block_list *bl,unsigned char dir);
int unit_getdir(struct block_list *bl);
// そこまで歩行でたどり着けるかの判定
diff --git a/vcproj-7.1/map-server_sql.vcproj b/vcproj-7.1/map-server_sql.vcproj index bd809ae37..c5a9fe6ca 100644 --- a/vcproj-7.1/map-server_sql.vcproj +++ b/vcproj-7.1/map-server_sql.vcproj @@ -270,6 +270,9 @@ RelativePath="..\src\map\trade.c">
</File>
<File
+ RelativePath="..\src\map\unit.c">
+ </File>
+ <File
RelativePath="..\src\zlib\unzip.c">
</File>
<File
@@ -415,6 +418,9 @@ RelativePath="..\src\map\trade.h">
</File>
<File
+ RelativePath="..\src\map\unit.h">
+ </File>
+ <File
RelativePath="..\src\common\utils.h">
</File>
<File
diff --git a/vcproj-7.1/map-server_txt.vcproj b/vcproj-7.1/map-server_txt.vcproj index 7bd422c2a..8e5e54235 100644 --- a/vcproj-7.1/map-server_txt.vcproj +++ b/vcproj-7.1/map-server_txt.vcproj @@ -271,6 +271,9 @@ RelativePath="..\src\map\trade.c">
</File>
<File
+ RelativePath="..\src\map\unit.c">
+ </File>
+ <File
RelativePath="..\src\zlib\unzip.c">
</File>
<File
@@ -416,6 +419,9 @@ RelativePath="..\src\map\trade.h">
</File>
<File
+ RelativePath="..\src\map\unit.h">
+ </File>
+ <File
RelativePath="..\src\common\utils.h">
</File>
<File
|