diff options
| -rw-r--r-- | Changelog-Trunk.txt | 153 | ||||
| -rw-r--r-- | src/common/core.c | 5 | ||||
| -rw-r--r-- | src/common/graph.c | 2 | ||||
| -rw-r--r-- | src/common/grfio.c | 2 | ||||
| -rw-r--r-- | src/common/grfio.h | 2 | ||||
| -rw-r--r-- | src/common/socket.c | 2 |
6 files changed, 84 insertions, 82 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index a8dc00b14..9d13f0176 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,84 +3,85 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
- -2006/09/18 - * Fixed Spider Web fire damage bonus. [Skotlex] - * Made Global chat always reply back to you even on @/# commands, this - prevents the client from muting yourself due to "hack". However, this same - fix isn't easily applicable to @ commands invoked from whispers or - party/guild messages, those are still pending. [Skotlex] - * Merged Meruru's update to socket.c, which includes a rewritten parse - function, which should hopefully be more efficient than the previous code. - [Skotlex] - * The new code includes support for two config settings - (packet_athena.txt): frame_size, which can be used to alter the logic - packet-size allowed by the code, and mode_neg, which when set to yes, sets - TCP_NODELAY on all connections (defaults to yes). [Skotlex] - * High-Jump is usable everywhere now, except that on maps where it - previously failed, now will just make you jump in place. [Skotlex] - * Fixed TK_RUN as per packets provided by AuronX. [Skotlex] - * Moved the equipment/card resistances to status ailments outside of - status_get_sc_def, so that they are applied only to rate, not duration. - [Skotlex] - * Modified the Asura code (again), hopefully movement sprite issues are - fixed now [Skotlex] - * @reloadscript scripts will no longer eliminate mobs with no respawn data. - But watch out for possible bugs (I think someone mentioned 1 extra - treasure box will spawn when you use it? This needs testing!) [Skotlex] - * Made speed_add_rate a linearly stacking increase. [Skotlex] - * Corrected a possible overflow when using show_mob_info to display the - mob's up as a percent. [Skotlex] - * Corrected the documentation for checkoption/checkoption1/checkoption2 - [Skotlex] - * Reenabled client requesting to self mute, as the whole knockback packet - issues of the past which were causing players to mute themselves when being - knockback is no longer there. [Skotlex] -2006/09/17 - * Fixed NPC_INVISIBLE's cloak ending after attacking once. [Skotlex] - * Fixed SG_FUSION being castable without Soul Link state. [Skotlex] - * Moved the item-use restriction SC checks from clif.c to pc_use_item, - fixed Gravitation blocking potion usage on it's area of effect. [Skotlex] - * Sphere Marines and Summoned Flora are now inmune to class-changing. - [Skotlex] -2006/09/16 - * Added monster_ai&256. When set, a monster will pick a random starting - position to begin checking versus it's skills, otherwise, it will always - begin checking from the beginning. [Skotlex] - * Fixed the status change duration reduction equation was was totally - wrong, thanks to k3dt [Skotlex] -2006/09/15 - * Now mobs won't do a distance check to lose their target on every ai - iteration, but only when they finish walking (unless you set monster_ai&1) - [Skotlex] - * The chase distance before a mob gives up following a player has been - increased from view-size (range2) to min-chase (range3). [Skotlex] - * Reverted the Summon Flora change where all plants were being summoned in - one go. [Skotlex] - * Moved the weapon repair effect to where it belongs (after successfully - repairing an item) [Skotlex] - * Added config setting "friend_auto_add" (battle/player.conf), if set, when - you accept someone as your friend, both characters will show up on each - other's friend list. [Skotlex] +2006/09/19
+ * Fixed some gcc4 warnings [Toms]
+2006/09/18
+ * Fixed Spider Web fire damage bonus. [Skotlex]
+ * Made Global chat always reply back to you even on @/# commands, this
+ prevents the client from muting yourself due to "hack". However, this same
+ fix isn't easily applicable to @ commands invoked from whispers or
+ party/guild messages, those are still pending. [Skotlex]
+ * Merged Meruru's update to socket.c, which includes a rewritten parse
+ function, which should hopefully be more efficient than the previous code.
+ [Skotlex]
+ * The new code includes support for two config settings
+ (packet_athena.txt): frame_size, which can be used to alter the logic
+ packet-size allowed by the code, and mode_neg, which when set to yes, sets
+ TCP_NODELAY on all connections (defaults to yes). [Skotlex]
+ * High-Jump is usable everywhere now, except that on maps where it
+ previously failed, now will just make you jump in place. [Skotlex]
+ * Fixed TK_RUN as per packets provided by AuronX. [Skotlex]
+ * Moved the equipment/card resistances to status ailments outside of
+ status_get_sc_def, so that they are applied only to rate, not duration.
+ [Skotlex]
+ * Modified the Asura code (again), hopefully movement sprite issues are
+ fixed now [Skotlex]
+ * @reloadscript scripts will no longer eliminate mobs with no respawn data.
+ But watch out for possible bugs (I think someone mentioned 1 extra
+ treasure box will spawn when you use it? This needs testing!) [Skotlex]
+ * Made speed_add_rate a linearly stacking increase. [Skotlex]
+ * Corrected a possible overflow when using show_mob_info to display the
+ mob's up as a percent. [Skotlex]
+ * Corrected the documentation for checkoption/checkoption1/checkoption2
+ [Skotlex]
+ * Reenabled client requesting to self mute, as the whole knockback packet
+ issues of the past which were causing players to mute themselves when being
+ knockback is no longer there. [Skotlex]
+2006/09/17
+ * Fixed NPC_INVISIBLE's cloak ending after attacking once. [Skotlex]
+ * Fixed SG_FUSION being castable without Soul Link state. [Skotlex]
+ * Moved the item-use restriction SC checks from clif.c to pc_use_item,
+ fixed Gravitation blocking potion usage on it's area of effect. [Skotlex]
+ * Sphere Marines and Summoned Flora are now inmune to class-changing.
+ [Skotlex]
+2006/09/16
+ * Added monster_ai&256. When set, a monster will pick a random starting
+ position to begin checking versus it's skills, otherwise, it will always
+ begin checking from the beginning. [Skotlex]
+ * Fixed the status change duration reduction equation was was totally
+ wrong, thanks to k3dt [Skotlex]
+2006/09/15
+ * Now mobs won't do a distance check to lose their target on every ai
+ iteration, but only when they finish walking (unless you set monster_ai&1)
+ [Skotlex]
+ * The chase distance before a mob gives up following a player has been
+ increased from view-size (range2) to min-chase (range3). [Skotlex]
+ * Reverted the Summon Flora change where all plants were being summoned in
+ one go. [Skotlex]
+ * Moved the weapon repair effect to where it belongs (after successfully
+ repairing an item) [Skotlex]
+ * Added config setting "friend_auto_add" (battle/player.conf), if set, when
+ you accept someone as your friend, both characters will show up on each
+ other's friend list. [Skotlex]
2006/09/14
- * Changed Extremity Fist's code to make you actually walk past your target, - which displays a much more correct "animation" for the skill. Thanks to - HiddenDragon for the information and code. [Skotlex] - * Updated the item_db search functions so that when returning the - dummy-item, it first updates the nameid to match the requested one, this - prevents pc_additem later on giving you an item with ID 500 instead of the - ID requested. [Skotlex] - * Added a clif_skill_nodamage packet when using Repair Weapon, just to see - what happens. [Skotlex] - * Likely fixed "half" of the alliance being saved, which ends up in guilds - that can attack another, but not viceversa. [Skotlex] - * Added deleting of saved Status changes on character delete for the - Char-TXT server. [Skotlex] - * Fixed the can-act delay never being checked when requesting to use - Homunculus Skills. [Skotlex] + * Changed Extremity Fist's code to make you actually walk past your target,
+ which displays a much more correct "animation" for the skill. Thanks to
+ HiddenDragon for the information and code. [Skotlex]
+ * Updated the item_db search functions so that when returning the
+ dummy-item, it first updates the nameid to match the requested one, this
+ prevents pc_additem later on giving you an item with ID 500 instead of the
+ ID requested. [Skotlex]
+ * Added a clif_skill_nodamage packet when using Repair Weapon, just to see
+ what happens. [Skotlex]
+ * Likely fixed "half" of the alliance being saved, which ends up in guilds
+ that can attack another, but not viceversa. [Skotlex]
+ * Added deleting of saved Status changes on character delete for the
+ Char-TXT server. [Skotlex]
+ * Fixed the can-act delay never being checked when requesting to use
+ Homunculus Skills. [Skotlex]
* Fixed warmth skills draining SP of the target, not the caster. [Skotlex]
- * When TK_DODGE triggers, it will no longer delay your attack or movement. - [Skotlex] + * When TK_DODGE triggers, it will no longer delay your attack or movement.
+ [Skotlex]
* Estimation /Sense/ whatever will no longer hide the vit bonus to mdef2,
as reported by Playtester. [Skotlex]
* Updated Summon Flora to summon the max number of possible plants on one
diff --git a/src/common/core.c b/src/common/core.c index 75335b597..b35551d39 100644 --- a/src/common/core.c +++ b/src/common/core.c @@ -33,8 +33,9 @@ char **arg_v = NULL; char *SERVER_NAME = NULL;
char SERVER_TYPE = ATHENA_SERVER_NONE;
static void (*term_func)(void) = NULL;
-static char eA_svn_version[10];
-
+#ifdef SVNVERSION
+ static char eA_svn_version[10];
+#endif
/*======================================
* CORE : Set function
*--------------------------------------
diff --git a/src/common/graph.c b/src/common/graph.c index 4caa830e6..3602f511f 100644 --- a/src/common/graph.c +++ b/src/common/graph.c @@ -267,7 +267,7 @@ static int graph_draw_timer(int tid,unsigned int tick,int id,int data) return 0;
}
-void graph_add_sensor(const char* string, int interval, unsigned int (*callback_func)(void))
+void graph_add_sensor(const unsigned char* string, int interval, unsigned int (*callback_func)(void))
{
int draw_interval = interval * 2;
struct graph *g = graph_create(GRP_WIDTH,GRP_HEIGHT);
diff --git a/src/common/grfio.c b/src/common/grfio.c index 6cfc7eeaa..5597177c5 100644 --- a/src/common/grfio.c +++ b/src/common/grfio.c @@ -403,7 +403,7 @@ int deflate_file (const char *source, const char *filename) return 0;
}
-unsigned long grfio_crc32 (const char *buf, unsigned int len)
+unsigned long grfio_crc32 (const unsigned char *buf, unsigned int len)
{
return crc32(crc32(0L, Z_NULL, 0), buf, len);
}
diff --git a/src/common/grfio.h b/src/common/grfio.h index e2a70ae75..4ccdd00c7 100644 --- a/src/common/grfio.h +++ b/src/common/grfio.h @@ -13,7 +13,7 @@ char *grfio_alloc_ptr(char *fname); #define grfio_read(fn) grfio_reads(fn, NULL)
int grfio_size(char*); // GRFIO data file size get
-unsigned long grfio_crc32(const char *buf, unsigned int len);
+unsigned long grfio_crc32(const unsigned char *buf, unsigned int len);
int decode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen);
int encode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen);
diff --git a/src/common/socket.c b/src/common/socket.c index 450f6d09b..b5eda7b27 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -1346,7 +1346,7 @@ bool session_isActive(int fd) in_addr_t resolve_hostbyname(char* hostname, unsigned char *ip, char *ip_str) {
struct hostent *h = gethostbyname(hostname);
- unsigned char ip_buf[16];
+ char ip_buf[16];
unsigned char ip2[4];
if (!h) return 0;
if (ip == NULL) ip = ip2;
|