From 564f31658671f49ec7075a6bf5206e3da708361c Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Thu, 1 Dec 2022 19:32:59 +0100 Subject: [PATCH] Cambiado el nombre del enemigo diskette a floppy --- data/enemies/{diskette.ani => floppy.ani} | 0 data/enemies/{diskette.png => floppy.png} | Bin data/room/05.room | 4 ++-- data/room/12.room | 8 ++++---- data/room/17.room | 8 ++++---- data/room/27.room | 4 ++-- data/room/34.room | 4 ++-- data/room/50.room | 8 ++++---- source/director.cpp | 12 ++++++------ source/ending2.cpp | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) rename data/enemies/{diskette.ani => floppy.ani} (100%) rename data/enemies/{diskette.png => floppy.png} (100%) diff --git a/data/enemies/diskette.ani b/data/enemies/floppy.ani similarity index 100% rename from data/enemies/diskette.ani rename to data/enemies/floppy.ani diff --git a/data/enemies/diskette.png b/data/enemies/floppy.png similarity index 100% rename from data/enemies/diskette.png rename to data/enemies/floppy.png diff --git a/data/room/05.room b/data/room/05.room index e3efaf9..d023546 100644 --- a/data/room/05.room +++ b/data/room/05.room @@ -11,8 +11,8 @@ itemColor1=bright_green itemColor2=green [enemy] -tileSetFile=diskette.png -animation=diskette.ani +tileSetFile=floppy.png +animation=floppy.ani width=16 height=16 x=15 diff --git a/data/room/12.room b/data/room/12.room index c9266a2..1c08be6 100644 --- a/data/room/12.room +++ b/data/room/12.room @@ -11,8 +11,8 @@ itemColor1=red itemColor2=magenta [enemy] -tileSetFile=diskette.png -animation=diskette.ani +tileSetFile=floppy.png +animation=floppy.ani width=16 height=16 x=9 @@ -27,8 +27,8 @@ color=green [/enemy] [enemy] -tileSetFile=diskette.png -animation=diskette.ani +tileSetFile=floppy.png +animation=floppy.ani width=16 height=16 x=1 diff --git a/data/room/17.room b/data/room/17.room index da34041..7140717 100644 --- a/data/room/17.room +++ b/data/room/17.room @@ -11,8 +11,8 @@ itemColor1=yellow itemColor2=red [enemy] -tileSetFile=diskette.png -animation=diskette.ani +tileSetFile=floppy.png +animation=floppy.ani width=16 height=16 x=5 @@ -27,8 +27,8 @@ color=green [/enemy] [enemy] -tileSetFile=diskette.png -animation=diskette.ani +tileSetFile=floppy.png +animation=floppy.ani width=16 height=16 x=12 diff --git a/data/room/27.room b/data/room/27.room index 72a3fbf..6566b5e 100644 --- a/data/room/27.room +++ b/data/room/27.room @@ -9,8 +9,8 @@ roomLeft=26.room roomRight=0 #[enemy] -#tileSetFile=diskette.png -#animation=diskette.ani +#tileSetFile=floppy.png +#animation=floppy.ani #width=16 #height=16 #x=2 diff --git a/data/room/34.room b/data/room/34.room index ebf99b3..8b937c6 100644 --- a/data/room/34.room +++ b/data/room/34.room @@ -11,8 +11,8 @@ itemColor1=green itemColor2=red [enemy] -tileSetFile=diskette.png -animation=diskette.ani +tileSetFile=floppy.png +animation=floppy.ani width=16 height=16 x=20 diff --git a/data/room/50.room b/data/room/50.room index ef91863..5ecf1d0 100644 --- a/data/room/50.room +++ b/data/room/50.room @@ -9,8 +9,8 @@ roomLeft=0 roomRight=49.room [enemy] -tileSetFile=diskette.png -animation=diskette.ani +tileSetFile=floppy.png +animation=floppy.ani width=16 height=16 x=7 @@ -25,8 +25,8 @@ color=magenta [/enemy] [enemy] -tileSetFile=diskette.png -animation=diskette.ani +tileSetFile=floppy.png +animation=floppy.ani width=16 height=16 x=20 diff --git a/source/director.cpp b/source/director.cpp index ec497de..990ab7e 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -585,7 +585,7 @@ void Director::loadResources(section_t section) textureList.push_back("demon.png"); textureList.push_back("heavy.png"); textureList.push_back("dimallas.png"); - textureList.push_back("diskette.png"); + textureList.push_back("floppy.png"); textureList.push_back("dong.png"); textureList.push_back("guitar.png"); textureList.push_back("jailbattle_alien.png"); @@ -648,7 +648,7 @@ void Director::loadResources(section_t section) animationList.push_back("demon.ani"); animationList.push_back("heavy.ani"); animationList.push_back("dimallas.ani"); - animationList.push_back("diskette.ani"); + animationList.push_back("floppy.ani"); animationList.push_back("dong.ani"); animationList.push_back("guitar.ani"); animationList.push_back("jailbattle_alien.ani"); @@ -759,7 +759,7 @@ void Director::loadResources(section_t section) textureList.push_back("crosshair.png"); textureList.push_back("demon.png"); textureList.push_back("dimallas.png"); - textureList.push_back("diskette.png"); + textureList.push_back("floppy.png"); textureList.push_back("dong.png"); textureList.push_back("guitar.png"); textureList.push_back("heavy.png"); @@ -840,7 +840,7 @@ void Director::loadResources(section_t section) animationList.push_back("crosshair.ani"); animationList.push_back("demon.ani"); animationList.push_back("dimallas.ani"); - animationList.push_back("diskette.ani"); + animationList.push_back("floppy.ani"); animationList.push_back("dong.ani"); animationList.push_back("guitar.ani"); animationList.push_back("heavy.ani"); @@ -1537,8 +1537,8 @@ bool Director::setFileList() asset->add(prefix + "/data/enemies/demon.png", t_bitmap); asset->add(prefix + "/data/enemies/dimallas.ani", t_data); asset->add(prefix + "/data/enemies/dimallas.png", t_bitmap); - asset->add(prefix + "/data/enemies/diskette.ani", t_data); - asset->add(prefix + "/data/enemies/diskette.png", t_bitmap); + asset->add(prefix + "/data/enemies/floppy.ani", t_data); + asset->add(prefix + "/data/enemies/floppy.png", t_bitmap); asset->add(prefix + "/data/enemies/dong.ani", t_data); asset->add(prefix + "/data/enemies/dong.png", t_bitmap); asset->add(prefix + "/data/enemies/guitar.ani", t_data); diff --git a/source/ending2.cpp b/source/ending2.cpp index bd5b2c0..d3e6488 100644 --- a/source/ending2.cpp +++ b/source/ending2.cpp @@ -288,7 +288,7 @@ void Ending2::iniSpriteList() // Añade los valores spriteList.push_back("bin"); - spriteList.push_back("diskette"); + spriteList.push_back("floppy"); spriteList.push_back("bird"); spriteList.push_back("chip"); spriteList.push_back("jeannine");