From 4ea9cd539ea15e11cce1d57bf1b4d65c4d0ffd83 Mon Sep 17 00:00:00 2001 From: Juliano Leal Goncalves Date: Mon, 6 Sep 2021 11:29:04 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20'PortalStruct'=20struct?= =?UTF-8?q?=20to=20'Portal'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/loadsave.cpp | 4 ++-- Source/portal.cpp | 2 +- Source/portal.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp index 1fd1218bb..aa1b30b50 100644 --- a/Source/loadsave.cpp +++ b/Source/loadsave.cpp @@ -783,7 +783,7 @@ void LoadLighting(LoadHelper *file, Light *pLight) void LoadPortal(LoadHelper *file, int i) { - PortalStruct *pPortal = &Portals[i]; + Portal *pPortal = &Portals[i]; pPortal->open = file->NextBool32(); pPortal->position.x = file->NextLE(); @@ -1423,7 +1423,7 @@ void SaveLighting(SaveHelper *file, Light *pLight) void SavePortal(SaveHelper *file, int i) { - PortalStruct *pPortal = &Portals[i]; + Portal *pPortal = &Portals[i]; file->WriteLE(pPortal->open ? 1 : 0); file->WriteLE(pPortal->position.x); diff --git a/Source/portal.cpp b/Source/portal.cpp index 5eae3f5eb..22212905b 100644 --- a/Source/portal.cpp +++ b/Source/portal.cpp @@ -14,7 +14,7 @@ namespace devilution { /** In-game state of portals. */ -PortalStruct Portals[MAXPORTAL]; +Portal Portals[MAXPORTAL]; namespace { diff --git a/Source/portal.h b/Source/portal.h index 2f3115363..c874cc98c 100644 --- a/Source/portal.h +++ b/Source/portal.h @@ -12,7 +12,7 @@ namespace devilution { #define MAXPORTAL 4 -struct PortalStruct { +struct Portal { bool open; Point position; int level; @@ -20,7 +20,7 @@ struct PortalStruct { bool setlvl; }; -extern PortalStruct Portals[MAXPORTAL]; +extern Portal Portals[MAXPORTAL]; void InitPortals(); void SetPortalStats(int i, bool o, int x, int y, int lvl, dungeon_type lvltype);