From 944ff6fb78c48650ae478b6a140b03c4560a7d84 Mon Sep 17 00:00:00 2001 From: Juliano Leal Goncalves Date: Sun, 23 May 2021 23:43:45 -0300 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Change=20'InitMonster'=20t?= =?UTF-8?q?o=20take=20a=20'Point'=20instead=20of=202=20separate=20ints?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/monster.cpp | 12 ++++++------ Source/monster.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/monster.cpp b/Source/monster.cpp index 40506a144..92d68a539 100644 --- a/Source/monster.cpp +++ b/Source/monster.cpp @@ -468,14 +468,14 @@ void ClearMVars(int i) monster[i].actionFrame = 0; } -void InitMonster(int i, Direction rd, int mtype, int x, int y) +void InitMonster(int i, Direction rd, int mtype, Point position) { CMonster *monst = &Monsters[mtype]; monster[i]._mdir = rd; - monster[i].position.tile = { x, y }; - monster[i].position.future = { x, y }; - monster[i].position.old = { x, y }; + monster[i].position.tile = position; + monster[i].position.future = position; + monster[i].position.old = position; monster[i]._mMTidx = mtype; monster[i]._mmode = MM_STAND; monster[i].mName = _(monst->MData->mName); @@ -659,7 +659,7 @@ void PlaceMonster(int i, int mtype, int x, int y) dMonster[x][y] = i + 1; auto rd = static_cast(GenerateRnd(8)); - InitMonster(i, rd, mtype, x, y); + InitMonster(i, rd, mtype, { x, y }); } void PlaceUniqueMonst(int uniqindex, int miniontype, int bosspacksize) @@ -1229,7 +1229,7 @@ int AddMonster(int x, int y, Direction dir, int mtype, bool InMap) int i = monstactive[nummonsters++]; if (InMap) dMonster[x][y] = i + 1; - InitMonster(i, dir, mtype, x, y); + InitMonster(i, dir, mtype, { x, y }); return i; } diff --git a/Source/monster.h b/Source/monster.h index 7e4ff1f7a..b2788628b 100644 --- a/Source/monster.h +++ b/Source/monster.h @@ -206,7 +206,7 @@ extern int nummtypes; void InitLevelMonsters(); void GetLevelMTypes(); void InitMonsterGFX(int monst); -void InitMonster(int i, Direction rd, int mtype, int x, int y); +void InitMonster(int i, Direction rd, int mtype, Point position); void ClrAllMonsters(); void monster_some_crypt(); void PlaceGroup(int mtype, int num, int leaderf, int leader);