summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-27 15:25:53 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-27 15:25:53 +0000
commit1dbbdc94e863d992845934624a28c8c53c624cff (patch)
tree2cebfd553f50bb977679da9a7d808f7ed590c6a3
parent09972deecb1aaf08bfa331ccc20830514913b234 (diff)
downloadhercules-1dbbdc94e863d992845934624a28c8c53c624cff.tar.gz
hercules-1dbbdc94e863d992845934624a28c8c53c624cff.tar.bz2
hercules-1dbbdc94e863d992845934624a28c8c53c624cff.tar.xz
hercules-1dbbdc94e863d992845934624a28c8c53c624cff.zip
- Small change in @commands, may fix the null-pointer error.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6318 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/atcommand.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 5a8122825..f98b04347 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,7 @@ 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/04/27
+ * Small change in @commands, may fix the null-pointer error. [Skotlex]
* Changebase script command will also refresh the weapon sprites (in case
you changed into Wedding/Xmas class) [Skotlex]
* Small change in the pet_ai that should stop the "strange" catch-up
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 804193130..6a2bccf3b 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -1173,7 +1173,7 @@ int atcommand_commands(const int fd, struct map_session_data* sd,
clif_displaymessage(fd, msg_txt(273));
memset(atcmd_output, 0, sizeof atcmd_output);
for (i = 0; atcommand_info[i].type != AtCommand_None; i++)
- if (atcommand_info[i].level <= level) {
+ if (atcommand_info[i].level <= level && atcommand_info[i].command) {
count++;
strcat(atcmd_output, atcommand_info[i].command);
strcat(atcmd_output, " ");