diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-08 19:37:56 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-08 19:37:56 +0000 |
| commit | bdc2958ced13d80122b040ab357fd002d5c0e550 (patch) | |
| tree | d133c73651e4ac575964c91496ebe13ea631fc0a /src/map/pc.c | |
| parent | 7a308b07b92f9aa82b0e3d8dc987d69f3535b7e2 (diff) | |
| download | hercules-bdc2958ced13d80122b040ab357fd002d5c0e550.tar.gz hercules-bdc2958ced13d80122b040ab357fd002d5c0e550.tar.bz2 hercules-bdc2958ced13d80122b040ab357fd002d5c0e550.tar.xz hercules-bdc2958ced13d80122b040ab357fd002d5c0e550.zip | |
- Unified the rest and ganstar paradise code into a single function.
- Moved the Happy State trigger to the regen function, it now triggers at the same time the SPTIME does.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8681 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 0ec41a6c2..855a84979 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4768,8 +4768,7 @@ void pc_damage(struct map_session_data *sd,struct block_list *src,unsigned int h if(pc_issit(sd)) { pc_setstand(sd); - skill_gangsterparadise(sd,0); - skill_rest(sd,0); + skill_sit(sd,0); } clif_updatestatus(sd,SP_HP); |