summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-28 04:07:07 +0000
committermc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-28 04:07:07 +0000
commit27e211016b4dd484ac0a2ec8038ef60a59a07261 (patch)
tree52f5baf8892945442d2aabddb61ade0f0d153a37
parent2be730b2cd3503eac660ae456e569cd3aa8c778a (diff)
downloadhercules-27e211016b4dd484ac0a2ec8038ef60a59a07261.tar.gz
hercules-27e211016b4dd484ac0a2ec8038ef60a59a07261.tar.bz2
hercules-27e211016b4dd484ac0a2ec8038ef60a59a07261.tar.xz
hercules-27e211016b4dd484ac0a2ec8038ef60a59a07261.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@830 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt3
-rw-r--r--src/common/malloc.c1
-rw-r--r--src/common/timer.c2
-rw-r--r--src/map/map.c4
-rw-r--r--src/map/map.h2
5 files changed, 9 insertions, 3 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 91bcd25b8..c375d4c66 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,8 @@
Date Added
12/27
+ * Reinitialized variable 'c' in map_readmap, it's supposed to have a start value. Ex. '-'. [MC Cameri]
+ * Commented out dump_timer_heap() again... [MC Cameri]
+ * Added include of string.h in malloc.c, was causing compile errors/warnings [MC Cameri]
* Modified the map progress bar to reduce updates (SVN 829) [MouseJstr]
* Updated map cache system from jA 1087 - change read_map_from_bitmap to 2 to
enable zlib compression [celest]
diff --git a/src/common/malloc.c b/src/common/malloc.c
index dd1be030f..fad5183d1 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -1,5 +1,6 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "malloc.h"
void* aMalloc_( size_t size, const char *file, int line, const char *func )
diff --git a/src/common/timer.c b/src/common/timer.c
index 49d205619..4c602b51e 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -114,6 +114,7 @@ unsigned int gettick(void)
*/
// デバッグ用関数群
+/*
static void dump_timer_heap(void) {
int j;
for(j = 1 ; j <= timer_heap[0] ; j++) {
@@ -128,6 +129,7 @@ static void dump_timer_heap(void) {
printf("%d : %d %d\n",j,timer_heap[j],timer_data[timer_heap[j]].tick);
}
}
+*/
static void push_timer_heap(int index)
{
diff --git a/src/map/map.c b/src/map/map.c
index fc2049724..d6f6d72fa 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1886,13 +1886,13 @@ static int map_readmap(int m,char *fn, char *alias, int *map_cache, int maxmap)
unsigned char *gat="";
size_t size;
- int i;
+ int i = 0;
int e = 0;
char progress[21] = " ";
//printf("\rLoading Maps [%d/%d]: %-50s ",m,map_num,fn);
if (map_num) { //avoid map-server crashing if there are 0 maps
- char c;
+ char c = '-';
static int lasti = -1;
static int last_time = -1;
i=m*20/maxmap;
diff --git a/src/map/map.h b/src/map/map.h
index cb8438352..ccedaacaf 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -10,7 +10,7 @@
#define PC_CLASS_BASE2 (PC_CLASS_BASE + 4001)
#define PC_CLASS_BASE3 (PC_CLASS_BASE2 + 22)
#define MAX_NPC_PER_MAP 512
-#define BLOCK_SIZE 8
+#define BLOCK_SIZE 8 // Never zero
#define AREA_SIZE battle_config.area_size
#define LOCAL_REG_NUM 16
#define LIFETIME_FLOORITEM 60