diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-07 16:49:03 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-07 16:49:03 +0000 |
| commit | b795233e374987f4c427f59922f271810f937eef (patch) | |
| tree | 047fafbeb99c4b12bcaadf046854af54e85dcad0 /src/map/trade.c | |
| parent | f4a6909849243c3e4776ddee4de962224e80ac9a (diff) | |
| download | hercules-b795233e374987f4c427f59922f271810f937eef.tar.gz hercules-b795233e374987f4c427f59922f271810f937eef.tar.bz2 hercules-b795233e374987f4c427f59922f271810f937eef.tar.xz hercules-b795233e374987f4c427f59922f271810f937eef.zip | |
Undid the memset->malloc_set replacement
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9626 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/trade.c')
| -rw-r--r-- | src/map/trade.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/trade.c b/src/map/trade.c index 36c6d43f4..63df19940 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -140,8 +140,8 @@ void trade_tradeack(struct map_session_data *sd, int type) { //Initiate trade sd->state.trading = 1; tsd->state.trading = 1; - malloc_set(&sd->deal, 0, sizeof(sd->deal)); - malloc_set(&tsd->deal, 0, sizeof(tsd->deal)); + memset(&sd->deal, 0, sizeof(sd->deal)); + memset(&tsd->deal, 0, sizeof(tsd->deal)); clif_tradestart(tsd, type); clif_tradestart(sd, type); } @@ -173,7 +173,7 @@ int impossible_trade_check(struct map_session_data *sd) { // remove equiped items (they can not be trade) for (i = 0; i < MAX_INVENTORY; i++) if (inventory[i].nameid > 0 && inventory[i].equip && !(inventory[i].equip & EQP_AMMO)) - malloc_set(&inventory[i], 0, sizeof(struct item)); + memset(&inventory[i], 0, sizeof(struct item)); // check items in player inventory for(i = 0; i < 10; i++) { |