Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow up fa40773 :

Browse Source 
* Revert change some code
This commit is contained in:
Napster 2015-09-13 08:47:07 +07:00
parent 93666ce79a
commit e56f329d5d
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/mmo.h
View File

@ -6,7 +6,7 @@
#include "cbasetypes.h" #include "cbasetypes.h"
#include "../common/db.h" #include "../common/db.h"
#include "../config/core.h" //#include "../config/core.h"
#include <time.h> #include <time.h>
// server->client protocol version // server->client protocol version

3
src/map/pc.c
View File

@ -8434,7 +8434,6 @@ void pc_setoption(struct map_session_data *sd,int type)
bool pc_setcart(struct map_session_data *sd,int type) { bool pc_setcart(struct map_session_data *sd,int type) {
#ifndef NEW_CARTS #ifndef NEW_CARTS
int cart[6] = {0x0000,OPTION_CART1,OPTION_CART2,OPTION_CART3,OPTION_CART4,OPTION_CART5}; int cart[6] = {0x0000,OPTION_CART1,OPTION_CART2,OPTION_CART3,OPTION_CART4,OPTION_CART5};
#else
int option; int option;
#endif #endif
nullpo_retr(false,sd); nullpo_retr(false,sd);
@ -8445,7 +8444,7 @@ bool pc_setcart(struct map_session_data *sd,int type) {
if( pc_checkskill(sd,MC_PUSHCART) <= 0 && type != 0 ) if( pc_checkskill(sd,MC_PUSHCART) <= 0 && type != 0 )
return false;// Push cart is required return false;// Push cart is required
#ifndef NEW_CARTS #ifdef NEW_CARTS
switch( type ) { switch( type ) {
case 0: case 0: