mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-05-11 11:33:56 +00:00
Code Issues Releases Wiki Activity

remove some unused stuff

Browse source
This commit is contained in:
fgenesis 2022-05-12 17:20:40 +02:00
parent a29ed11f98
commit 9bcb34c984
6 changed files with 2 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Aquaria/Avatar.cpp
View file

@ -996,13 +996,6 @@ void Avatar::onDamage(DamageData &d)
{ {
Entity::onDamage(d); Entity::onDamage(d);
if (dsq->difficulty == DSQ::DIFF_EASY)
{
if (d.damage > 0)
d.damage *= MULT_DMG_EASY;
}
skeletalSprite.getAnimationLayer(ANIMLAYER_UPPERBODYIDLE)->stopAnimation(); skeletalSprite.getAnimationLayer(ANIMLAYER_UPPERBODYIDLE)->stopAnimation();
if (dsq->continuity.form == FORM_NORMAL) if (dsq->continuity.form == FORM_NORMAL)
{ {

8
Aquaria/DSQ.cpp
View file

@ -175,10 +175,6 @@ DSQ::DSQ(const std::string& fileSystem, const std::string& extraDataDir)
bar_left = bar_right = bar_up = bar_down = barFade_left = barFade_right = 0; bar_left = bar_right = bar_up = bar_down = barFade_left = barFade_right = 0;
difficulty = DIFF_NORMAL;
watchQuitFlag = false; watchQuitFlag = false;
watchForQuit = false; watchForQuit = false;
@ -271,8 +267,8 @@ void DSQ::rumble(float leftMotor, float rightMotor, float time, int source, Inpu
void DSQ::newGame() void DSQ::newGame()
{ {
dsq->game->resetFromTitle(); dsq->game->resetFromTitle();
dsq->initScene = "NaijaCave"; dsq->initScene = ;
dsq->game->transitionToScene(dsq->initScene); dsq->game->transitionToScene("NaijaCave");
} }
void DSQ::loadElementEffects() void DSQ::loadElementEffects()

20
Aquaria/DSQ.h
View file

@ -255,9 +255,6 @@ public:
void playVisualEffect(int vfx, Vector position, Entity *target=0); void playVisualEffect(int vfx, Vector position, Entity *target=0);
void playNoEffect(); void playNoEffect();
typedef std::vector<std::string> StringList;
StringList profiles;
AquariaScreenTransition *screenTransition; AquariaScreenTransition *screenTransition;
Precacher precacher; Precacher precacher;
@ -265,8 +262,6 @@ public:
Entity *getFirstEntity(); Entity *getFirstEntity();
Entity *getNextEntity(); Entity *getNextEntity();
std::string initScene;
bool modIsSelected; bool modIsSelected;
void shakeCamera(float mag, float time); void shakeCamera(float mag, float time);
@ -297,8 +292,6 @@ public:
void toggleEffects(); void toggleEffects();
void debugMenu(); void debugMenu();
std::string dialogueFile;
void takeScreenshotKey(); void takeScreenshotKey();
void generateCollisionMask(RenderObject *r); void generateCollisionMask(RenderObject *r);
@ -349,8 +342,6 @@ public:
void run(float runTime = -1, bool skipRecurseCheck = false); // same as Core::run() but with recursion check void run(float runTime = -1, bool skipRecurseCheck = false); // same as Core::run() but with recursion check
void watch(float t, int canQuit = 0); void watch(float t, int canQuit = 0);
std::string lastVoiceFile;
UserSettings user, user_backup, user_bcontrol; UserSettings user, user_backup, user_bcontrol;
void prepScreen(bool t); void prepScreen(bool t);
@ -440,14 +431,6 @@ public:
std::string shotBank1; std::string shotBank1;
std::string shotBank2; std::string shotBank2;
enum Difficulty
{
DIFF_NORMAL = 0,
DIFF_EASY = 1
};
Difficulty difficulty;
std::string getSaveDirectory(); std::string getSaveDirectory();
void clickRingEffect(Vector position, int type=0, Vector color=Vector(1,1,1), float ut=0); void clickRingEffect(Vector position, int type=0, Vector color=Vector(1,1,1), float ut=0);
@ -513,8 +496,6 @@ protected:
std::vector <AquariaSaveSlot*> saveSlots; std::vector <AquariaSaveSlot*> saveSlots;
BitmapText *expText, *moneyText;
void clearMenu(float t = 0.01f); void clearMenu(float t = 0.01f);
std::vector <RenderObject*> menu; std::vector <RenderObject*> menu;
BitmapText *saveSlotPageCount; BitmapText *saveSlotPageCount;
@ -523,7 +504,6 @@ protected:
float shakeCameraTimer; float shakeCameraTimer;
float shakeCameraMag; float shakeCameraMag;
std::string currentPortrait;
void onUpdate(float dt); void onUpdate(float dt);
void onRender(); void onRender();

13
Aquaria/InGameMenu.cpp
View file

@ -2488,7 +2488,6 @@ void InGameMenu::create()
menu[2]->position = Vector(400, 12000); menu[2]->position = Vector(400, 12000);
menu[2]->setCanDirMove(false); menu[2]->setCanDirMove(false);
menu[3]->event.set(MakeFunctionEvent(InGameMenu, onLips));
menu[3]->useGlow("particles/glow", 64, 64); menu[3]->useGlow("particles/glow", 64, 64);
//menu[0]->position = Vector(150, 550); //menu[0]->position = Vector(150, 550);
menu[3]->position = Vector(400, 195); menu[3]->position = Vector(400, 195);
@ -3200,18 +3199,6 @@ FoodSlot* InGameMenu::getFoodSlotFromIndex()
return 0; return 0;
} }
void InGameMenu::onLips()
{
if (!foodMenu)
{
if (dsq->lastVoiceFile.find("NAIJA_SONG_") != std::string::npos)
{
dsq->stopVoice();
}
}
}
void InGameMenu::onExitCheckYes() void InGameMenu::onExitCheckYes()
{ {
dsq->sound->stopAllVoice(); dsq->sound->stopAllVoice();

1
Aquaria/InGameMenu.h
View file

@ -121,7 +121,6 @@ private:
void onPrevTreasurePage(); void onPrevTreasurePage();
void onNextTreasurePage(); void onNextTreasurePage();
void onLips();
void showInGameMenuExitCheck(); void showInGameMenuExitCheck();
void hideInGameMenuExitCheck(bool refocus); void hideInGameMenuExitCheck(bool refocus);

5
Aquaria/ManaBall.cpp
View file

@ -42,11 +42,6 @@ ManaBall::ManaBall(Vector pos, float amount) : Quad()
setBlendType(BLEND_ADD); setBlendType(BLEND_ADD);
used = false; used = false;
addChild(&healEmitter, PM_STATIC); addChild(&healEmitter, PM_STATIC);
if (dsq->difficulty == DSQ::DIFF_EASY)
{
amount *= MULT_MANABALL_EASY;
}
} }
void ManaBall::destroy() void ManaBall::destroy()