diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-08-15 17:13:04 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-08-15 17:13:04 +0000 |
| commit | c25d6f5e6c3f092f70bf28cb0a3ac71e2ab89ead (patch) | |
| tree | b55395038c48dc99235e7385fbd43df5645e464a /src/map/status.c | |
| parent | 86b35597e549392cf2db3974fc140a50e021b5a0 (diff) | |
| download | hercules-c25d6f5e6c3f092f70bf28cb0a3ac71e2ab89ead.tar.gz hercules-c25d6f5e6c3f092f70bf28cb0a3ac71e2ab89ead.tar.bz2 hercules-c25d6f5e6c3f092f70bf28cb0a3ac71e2ab89ead.tar.xz hercules-c25d6f5e6c3f092f70bf28cb0a3ac71e2ab89ead.zip | |
* Some serious code cleanups
- adjusted @reloadbattleconf to not depend on variable ordering
- changed all battle vars to 'int' (removes pointless duplicit coding)
- added min, max and default columns to battle config data structure
- added properly bounded values for these columns (or at least tried to)
- battle-conf loading will now complain if it finds unknown settings,
and will reject values that are outside of the allowed range
- added CHATROOM_TITLE_SIZE and CHATROOM_PASS_SIZE
- partially cleaned up chatroom manipulation code
* Fixed 'Job_Professer' typo in mage jobchange quest
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11017 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/map/status.c b/src/map/status.c index 37d37b3bf..717aaa993 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -5640,10 +5640,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val break; case SC_ADRENALINE2: case SC_ADRENALINE: - if (val2 || !battle_config.party_skill_penalty) - val3 = 300; - else - val3 = 200; + val3 = (val2) ? 300 : 200; // aspd increase case SC_WEAPONPERFECTION: case SC_OVERTHRUST: if(sd && pc_checkskill(sd,BS_HILTBINDING)>0) |