diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-08-01 15:30:37 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-08-01 15:30:37 -0700 |
| commit | 09f72397156edb97631209c4cac765364f420bd3 (patch) | |
| tree | e597940099825d05f951773a822b27c556bb9390 | |
| parent | 3b98f3439e33b15bba2036c402f9925340fdb2b9 (diff) | |
| download | tmwa-09f72397156edb97631209c4cac765364f420bd3.tar.gz tmwa-09f72397156edb97631209c4cac765364f420bd3.tar.bz2 tmwa-09f72397156edb97631209c4cac765364f420bd3.tar.xz tmwa-09f72397156edb97631209c4cac765364f420bd3.zip | |
Fix a bug and make travis happy
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | src/map/pc.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index f45733d..f15f9d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ install: ## Main test script script: - - make -k -j2 CXX=${REAL_CXX} CPPFLAGS=-DQUIET + - make -k -j2 CXX=${REAL_CXX}\ -fabi-version=6 CPPFLAGS=-DQUIET ## Do something after the main test script after_script: diff --git a/src/map/pc.cpp b/src/map/pc.cpp index 8cc74b8..b683474 100644 --- a/src/map/pc.cpp +++ b/src/map/pc.cpp @@ -4256,7 +4256,7 @@ int pc_setaccountreg(dumb_ptr<map_session_data> sd, VarName reg, int val) } if (sd->status.account_reg_num < ACCOUNT_REG_NUM) { - sd->status.account_reg[i].str == reg; + sd->status.account_reg[i].str = reg; sd->status.account_reg[i].value = val; sd->status.account_reg_num++; intif_saveaccountreg(sd); |