Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 3 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
View
2 gemrb/core/GUI/GameControl.cpp
@@ -563,7 +563,7 @@ void GameControl::Draw(unsigned short x, unsigned short y)
if (target->GetStat(IE_NOTRACKING)) continue;
DrawArrowMarker(screen, target->Pos, viewport, black);
}
- delete monsters;
+ free(monsters);
} else {
trackerID = 0;
}
View
2 gemrb/plugins/FXOpcodes/FXOpcodes.cpp
@@ -3724,7 +3724,7 @@ int fx_monster_summoning (Scriptable* Owner, Actor* target, Effect* fx)
} else {
strnuprcpy(table, monster_summoning_2da[fx->Parameter2], 8);
}
- core->GetResRefFrom2DA(monster_summoning_2da[fx->Parameter2], monster, hit, areahit);
+ core->GetResRefFrom2DA(table, monster, hit, areahit);
if (!hit[0]) {
strnuprcpy(hit, fx->Resource2, 8);
View
4 gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp
@@ -3270,12 +3270,12 @@ int fx_disguise (Scriptable* /*Owner*/, Actor* target, Effect* fx)
}
ieDword anim = BASE_GET(IE_ANIMATION_ID);
- if (anim>=0x6000 || anim<=0x6fff) {
+ if (anim>=0x6000 && anim<=0x6fff) {
STAT_SET(IE_ANIMATION_ID, anim&0x600f);
return FX_APPLIED;
}
- if (anim>=0x5000 || anim<=0x5fff) {
+ if (anim>=0x5000 && anim<=0x5fff) {
STAT_SET(IE_ANIMATION_ID, anim&0x500f);
return FX_APPLIED;
}

No commit comments for this range

Something went wrong with that request. Please try again.