diff options
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/map/status.c b/src/map/status.c index 992cc0855..a43be5726 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -8329,10 +8329,17 @@ 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 } |