summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author(no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-01-23 22:01:12 +0000
committer(no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-01-23 22:01:12 +0000
commit4426eb53903895faa1e3db6c7db6c75716906dd1 (patch)
tree2e23075bc2b0de6a2e7a222a17579fe02ffa3a52
parent1310c6d32bed847857db9ca574b7a69fda640620 (diff)
downloadhercules-4426eb53903895faa1e3db6c7db6c75716906dd1.tar.gz
hercules-4426eb53903895faa1e3db6c7db6c75716906dd1.tar.bz2
hercules-4426eb53903895faa1e3db6c7db6c75716906dd1.tar.xz
hercules-4426eb53903895faa1e3db6c7db6c75716906dd1.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@971 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt2
-rw-r--r--src/map/map.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 5253c806c..e424cf83c 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,7 +1,7 @@
Date Added
01/23
- * Reverted back some of the char* changes [SVN 969] [Ajarn]
+ * Reverted back some of the char* changes [SVN 970] [Ajarn]
* Changed parse_script to now return char* [SVN 969] [Ajarn]
* Converted run_script and run_script_main from unsigned char* to char*
[SVN 969] [Ajarn]
diff --git a/src/map/map.c b/src/map/map.c
index f4124eab8..dc92d4113 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1939,7 +1939,7 @@ static int map_readmap(int m,char *fn, char *alias, int *map_cache, int maxmap)
xs=map[m].xs=*(int*)(gat+6);
ys=map[m].ys=*(int*)(gat+10);
- map[m].gat = (char *)aCallocA(s = map[m].xs * map[m].ys,sizeof(char));
+ map[m].gat = (unsigned char *)aCallocA(s = map[m].xs * map[m].ys,sizeof(unsigned char));
wh=map_waterheight(map[m].name);
for(y=0;y<ys;y++){
p=(struct gat_1cell*)(gat+y*xs*20+14);