Skip to content

Commit dd5352e

Browse files
committed
tabulation
1 parent 5932a59 commit dd5352e

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

game/gamemusic.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ static std::pair<DmTiming, DmEmbellishmentType> computeEmbellishmentAndTiming(co
201201
case zenkit::MusicTransitionEffect::END_AND_INTO:
202202
embellishment = DmEmbellishment_END_AND_INTRO;
203203
break;
204-
}
204+
}
205205

206206
DmTiming timing = DmTiming_MEASURE;
207207
switch (type) {
@@ -215,10 +215,10 @@ static std::pair<DmTiming, DmEmbellishmentType> computeEmbellishmentAndTiming(co
215215
case zenkit::MusicTransitionType::BEAT:
216216
timing = DmTiming_BEAT;
217217
break;
218-
}
218+
}
219219

220220
return std::make_pair(timing, embellishment);
221-
}
221+
}
222222

223223
struct GameMusic::GothicKitMusicProvider : GameMusic::MusicProvider {
224224
GothicKitMusicProvider(uint16_t rate, uint16_t channels) : GameMusic::MusicProvider(rate, channels) {

game/world/objects/npc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1650,7 +1650,7 @@ bool Npc::implAttack(uint64_t dt) {
16501650
}
16511651

16521652
if(act==FightAlgo::MV_MOVEA || act==FightAlgo::MV_MOVEG ||
1653-
act==FightAlgo::MV_TURNA || act==FightAlgo::MV_TURNG) {
1653+
act==FightAlgo::MV_TURNA || act==FightAlgo::MV_TURNG) {
16541654
if(!isAiQueueEmpty() && implAiTick(dt))
16551655
return true;
16561656
go2.set(currentTarget,(act==FightAlgo::MV_MOVEG || act==FightAlgo::MV_TURNG) ?

0 commit comments

Comments
 (0)