diff options
| author | Euphy <euphy@rathena.org> | 2013-06-20 22:46:37 -0400 |
|---|---|---|
| committer | Euphy <euphy@rathena.org> | 2013-06-20 22:46:37 -0400 |
| commit | 093193bd26b87f6afc876fd96b46271bd4e2ed81 (patch) | |
| tree | e52e626bc8edc9ea68eb48ad2e8ec517ee997d33 /src/map/status.c | |
| parent | 86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528 (diff) | |
| download | hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.gz hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.bz2 hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.xz hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.zip | |
Merged conflicts.
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/map/status.c b/src/map/status.c index a43be5726..55b79fff7 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -8329,17 +8329,10 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val break; case SC_BLOOD_SUCKER: { -<<<<<<< HEAD - struct block_list *src = iMap->id2bl(sce->val2); - val3 = 1; - if(src) - val3 = 200 + 100 * sce->val1 + status_get_int(src); -======= struct block_list *src = iMap->id2bl(val2); val3 = 1; if(src) val3 = 200 + 100 * val1 + status_get_int(src); ->>>>>>> upstream/master val4 = tick / 1000; tick_time = 1000; // [GodLesZ] tick time } |