diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 21:07:56 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 21:58:26 -0800 |
| commit | 00da6b5977574a0564169172227d8aab45be188f (patch) | |
| tree | dd52eee506a98e1eb9fcdea52e7db25079a7ad28 /src/map/mob.cpp | |
| parent | 4c91abd6a020ee030114ae3f22d8f6066e7528be (diff) | |
| download | tmwa-00da6b5977574a0564169172227d8aab45be188f.tar.gz tmwa-00da6b5977574a0564169172227d8aab45be188f.tar.bz2 tmwa-00da6b5977574a0564169172227d8aab45be188f.tar.xz tmwa-00da6b5977574a0564169172227d8aab45be188f.zip | |
Switch MATCH to separate begin/end macros
The for loop trick turned out to be very prone to infinite loops
at runtime. It's better to force compiler errors even if it's ugly.
Diffstat (limited to 'src/map/mob.cpp')
| -rw-r--r-- | src/map/mob.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/mob.cpp b/src/map/mob.cpp index 63db442..b01a4ff 100644 --- a/src/map/mob.cpp +++ b/src/map/mob.cpp @@ -2591,7 +2591,7 @@ int mob_damage(dumb_ptr<block_list> src, dumb_ptr<mob_data> md, int damage, if (it == ptv.end()) { Option<PartyPair> p_ = party_search(pid); - if OPTION_IS_SOME_NOLOOP(p, p_) + OMATCH_BEGIN_SOME (p, p_) { if (p->exp != 0) { @@ -2600,6 +2600,7 @@ int mob_damage(dumb_ptr<block_list> src, dumb_ptr<mob_data> md, int damage, flag = 0; } } + OMATCH_END (); } else { |