diff options
| author | panikon <panikon@zoho.com> | 2014-04-12 02:52:48 -0300 |
|---|---|---|
| committer | panikon <panikon@zoho.com> | 2014-04-12 02:52:48 -0300 |
| commit | 93ebe55b4db88c372436cc755b990453528d3364 (patch) | |
| tree | 836b1b59573430c21ea191c4615dbf97cb347bc8 | |
| parent | c1f916acdd60282af3838a204e9ec959e1beac12 (diff) | |
| parent | f4a566fc7f7bd0e9bbbe01c7341150ba3c12a03f (diff) | |
| download | hercules-93ebe55b4db88c372436cc755b990453528d3364.tar.gz hercules-93ebe55b4db88c372436cc755b990453528d3364.tar.bz2 hercules-93ebe55b4db88c372436cc755b990453528d3364.tar.xz hercules-93ebe55b4db88c372436cc755b990453528d3364.zip | |
Merge branch 'master' of http://github.com/HerculesWS/Hercules
82af3838a204e9ec959e1beac12.
| -rw-r--r-- | src/char/int_storage.c | 19 | ||||
| -rw-r--r-- | src/map/chrif.c | 6 | ||||
| -rw-r--r-- | src/map/map.c | 2 | ||||
| -rw-r--r-- | src/map/npc.c | 3 |
4 files changed, 14 insertions, 16 deletions
diff --git a/src/char/int_storage.c b/src/char/int_storage.c index c01e3619e..8c49c038d 100644 --- a/src/char/int_storage.c +++ b/src/char/int_storage.c @@ -332,15 +332,16 @@ int mapif_parse_ItemBoundRetrieve_sub(int fd) // Removes any view id that was set by an item that was removed if( bound_qt ) { - // Verifies equip bitmasks (see item.equip) and handles the sql statement -#define CHECK_REMOVE(var,mask,token) do {\ - if((var&mask)) {\ - if((var) != mask && s) StrBuf->AppendStr((&buf), ",");\ - StrBuf->AppendStr((&buf),"`"#token"`='0'");\ - var &= ~mask;\ - s++;\ - }\ - } while(0) + +#define CHECK_REMOVE(var,mask,token) do { /* Verifies equip bitmasks (see item.equip) and handles the sql statement */ \ + if ((var)&(mask)) { \ + if ((var) != (mask) && s) StrBuf->AppendStr(&buf, ","); \ + StrBuf->AppendStr(&buf,"`"#token"`='0'"); \ + (var) &= ~(mask); \ + s++; \ + } \ +} while(0) + StrBuf->Clear(&buf); StrBuf->Printf(&buf, "UPDATE `%s` SET ", char_db); for( j = 0; j < bound_qt; j++ ) { diff --git a/src/map/chrif.c b/src/map/chrif.c index 0458990bb..99a1935fd 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -841,10 +841,8 @@ bool chrif_char_ask_name_answer(int acc, const char* player_name, uint16 type, u * Request char server to change sex of char (modified by Yor) *------------------------------------------*/ void chrif_changedsex(int fd) { - int acc, sex; - - acc = RFIFOL(fd,2); - sex = RFIFOL(fd,6); + int acc = RFIFOL(fd,2); + //int sex = RFIFOL(fd,6); // Dead store. Uncomment if needed again. if ( battle_config.etc_log ) ShowNotice("chrif_changedsex %d.\n", acc); diff --git a/src/map/map.c b/src/map/map.c index 9e41bdca3..a423e6973 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -5808,7 +5808,7 @@ int do_init(int argc, char *argv[]) if (load_extras) { aFree(load_extras); load_extras = NULL; - load_extras_count = 0; + //load_extras_count = 0; // Dead store. Uncomment if needed again. } if( minimal ) { diff --git a/src/map/npc.c b/src/map/npc.c index f872a6170..ae374e961 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1155,8 +1155,7 @@ int npc_click(struct map_session_data* sd, struct npc_data* nd) // have view ids of mobs to avoid this "issue" [Panikon] if (sd->npc_id != 0) { // The player clicked a npc after entering an OnTouch area - if( sd->areanpc_id == sd->npc_id ); - else + if( sd->areanpc_id != sd->npc_id ) ShowError("npc_click: npc_id != 0\n"); return 1; |