jaildesigner-jailgames/coffee_crisis
1
0
Fork 1
Code Issues Pull Requests Projects Releases 12 Wiki Activity

writer class completed

Browse Source
This commit is contained in:
Sergio
2021-08-28 13:21:10 +02:00
parent 13be9df131
commit 946ab62c30
11 changed files with 84 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/font/nokia.txt
View File

@@ -3,7 +3,7 @@
# box height # box height
10 10
# 32 espacio ( ) # 32 espacio ( )
3 7
# 33 ! # 33 !
4 4
# 34 " # 34 "

1
source/director.cpp
View File

@@ -262,6 +262,7 @@ void Director::setFileList()
mFileList[27] = mExecutablePath + "/" + "../media/font/8bithud.png"; mFileList[27] = mExecutablePath + "/" + "../media/font/8bithud.png";
mFileList[46] = mExecutablePath + "/" + "../media/font/8bithud.txt"; mFileList[46] = mExecutablePath + "/" + "../media/font/8bithud.txt";
mFileList[28] = mExecutablePath + "/" + "../media/font/nokia.png"; mFileList[28] = mExecutablePath + "/" + "../media/font/nokia.png";
mFileList[52] = mExecutablePath + "/" + "../media/font/nokia.txt";
mFileList[29] = mExecutablePath + "/" + "../media/font/smb2_big.png"; mFileList[29] = mExecutablePath + "/" + "../media/font/smb2_big.png";
mFileList[47] = mExecutablePath + "/" + "../media/font/smb2_big.txt"; mFileList[47] = mExecutablePath + "/" + "../media/font/smb2_big.txt";
mFileList[30] = mExecutablePath + "/" + "../media/font/smb2.png"; mFileList[30] = mExecutablePath + "/" + "../media/font/smb2.png";

2
source/director.h
View File

@@ -9,7 +9,7 @@
#include "coffeedrop.h" #include "coffeedrop.h"
#include "item.h" #include "item.h"
#include "text.h" #include "text.h"
#include "text2.h" #include "writer.h"
#include "menu.h" #include "menu.h"
#include "const.h" #include "const.h"
#include "jail_audio.h" #include "jail_audio.h"

6
source/game.cpp
View File

@@ -355,9 +355,9 @@ void Game::init()
mFade->init(0x27, 0x27, 0x36); mFade->init(0x27, 0x27, 0x36);
// Inicializa los objetos de texto // Inicializa los objetos de texto
mText->init(); //mText->init();
mTextScoreBoard->init(); //mTextScoreBoard->init();
mTextBig->init(); //mTextBig->init();
// Inicializa el objeto con el menu de pausa // Inicializa el objeto con el menu de pausa
mMenuPause->init("PAUSE", 0, 12 * BLOCK, MENU_BACKGROUND_SOLID); mMenuPause->init("PAUSE", 0, 12 * BLOCK, MENU_BACKGROUND_SOLID);

2
source/game.h
View File

@@ -13,7 +13,7 @@
#include "item.h" #include "item.h"
#include "text.h" #include "text.h"
#include "text2.h" #include "writer.h"
#include "menu.h" #include "menu.h"
#include "input.h" #include "input.h"
#include "fade.h" #include "fade.h"

2
source/instructions.cpp
View File

@@ -73,7 +73,7 @@ void Instructions::init()
mSprite->init(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, mItemTexture, mRenderer); mSprite->init(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, mItemTexture, mRenderer);
mTicks = 0; mTicks = 0;
mTicksSpeed = 15; mTicksSpeed = 15;
mText->init(); //mText->init();
mManualQuit = false; mManualQuit = false;
mCounter = 0; mCounter = 0;
} }

101
source/intro.cpp
View File

@@ -16,12 +16,13 @@ Intro::Intro(SDL_Renderer *renderer, std::string *fileList, Lang *lang)
mEventHandler = new SDL_Event(); mEventHandler = new SDL_Event();
mBitmapTexture = new LTexture(); mBitmapTexture = new LTexture();
mTextTexture = new LTexture(); mTextTexture = new LTexture();
mText = new Text(mFileList[52], mTextTexture, mRenderer);
for (int i = 0; i < INTRO_TOTAL_BITMAPS; i++) for (int i = 0; i < INTRO_TOTAL_BITMAPS; i++)
mBitmap[i] = new SmartSprite(); mBitmap[i] = new SmartSprite();
for (int i = 0; i < INTRO_TOTAL_TEXTS; i++) for (int i = 0; i < INTRO_TOTAL_TEXTS; i++)
mText[i] = new Text2(mFileList[46], mTextTexture, mRenderer); mWriter[i] = new Writer(mText);
} }
// Destructor // Destructor
@@ -45,8 +46,8 @@ Intro::~Intro()
} }
for (int i = 0; i < INTRO_TOTAL_TEXTS; i++) for (int i = 0; i < INTRO_TOTAL_TEXTS; i++)
{ {
delete mText[i]; delete mWriter[i];
mText[i] = nullptr; mWriter[i] = nullptr;
} }
JA_DeleteMusic(mMusic); JA_DeleteMusic(mMusic);
@@ -133,55 +134,55 @@ void Intro::init()
// Inicializa los textos de la intro // Inicializa los textos de la intro
for (int i = 0; i < INTRO_TOTAL_TEXTS; i++) for (int i = 0; i < INTRO_TOTAL_TEXTS; i++)
{ {
mText[i]->init(); mWriter[i]->init();
mText[i]->setId(6 + i); mWriter[i]->setId(6 + i);
mText[i]->setIntroEvents(&mEvents[0]); mWriter[i]->setIntroEvents(&mEvents[0]);
mText[i]->setPosX(BLOCK * 0); mWriter[i]->setPosX(BLOCK * 0);
mText[i]->setPosY(SCREEN_HEIGHT - (BLOCK * 6)); mWriter[i]->setPosY(SCREEN_HEIGHT - (BLOCK * 6));
mText[i]->setKerning(-1); mWriter[i]->setKerning(-1);
mText[i]->setEnabled(false); mWriter[i]->setEnabled(false);
mText[i]->setEnabledTimer(180); mWriter[i]->setEnabledTimer(180);
} }
// Un dia qualsevol de l'any 2000 // Un dia qualsevol de l'any 2000
mText[0]->setCaption(mLang->getText(27)); mWriter[0]->setCaption(mLang->getText(27));
mText[0]->setWrittingSpeed(10); mWriter[0]->setSpeed(10);
// Tot esta tranquil a la UPV // Tot esta tranquil a la UPV
mText[1]->setCaption(mLang->getText(28)); mWriter[1]->setCaption(mLang->getText(28));
mText[1]->setWrittingSpeed(10); mWriter[1]->setSpeed(10);
// Fins que un desaprensiu... // Fins que un desaprensiu...
mText[2]->setCaption(mLang->getText(29)); mWriter[2]->setCaption(mLang->getText(29));
mText[2]->setWrittingSpeed(15); mWriter[2]->setSpeed(15);
// HEY! ME ANE A FERME UN CORTAET... // HEY! ME ANE A FERME UN CORTAET...
mText[3]->setCaption(mLang->getText(30)); mWriter[3]->setCaption(mLang->getText(30));
mText[3]->setWrittingSpeed(10); mWriter[3]->setSpeed(10);
// UAAAAAAAAAAAAA!!! // UAAAAAAAAAAAAA!!!
mText[4]->setCaption(mLang->getText(31)); mWriter[4]->setCaption(mLang->getText(31));
mText[4]->setWrittingSpeed(1); mWriter[4]->setSpeed(1);
// Espera un moment... // Espera un moment...
mText[5]->setCaption(mLang->getText(32)); mWriter[5]->setCaption(mLang->getText(32));
mText[5]->setWrittingSpeed(20); mWriter[5]->setSpeed(20);
// Si resulta que no tinc solt! // Si resulta que no tinc solt!
mText[6]->setCaption(mLang->getText(33)); mWriter[6]->setCaption(mLang->getText(33));
mText[6]->setWrittingSpeed(2); mWriter[6]->setSpeed(2);
// MERDA DE MAQUINA! // MERDA DE MAQUINA!
mText[7]->setCaption(mLang->getText(34)); mWriter[7]->setCaption(mLang->getText(34));
mText[7]->setWrittingSpeed(3); mWriter[7]->setSpeed(3);
// Blop... blop... blop... // Blop... blop... blop...
mText[8]->setCaption(mLang->getText(35)); mWriter[8]->setCaption(mLang->getText(35));
mText[8]->setWrittingSpeed(20); mWriter[8]->setSpeed(20);
for (int i = 0; i < INTRO_TOTAL_TEXTS; i++) for (int i = 0; i < INTRO_TOTAL_TEXTS; i++)
{ {
mText[i]->center(SCREEN_CENTER_X); mWriter[i]->center(SCREEN_CENTER_X);
} }
} }
@@ -240,7 +241,7 @@ section_t Intro::run()
for (int i = 0; i < INTRO_TOTAL_BITMAPS; i++) for (int i = 0; i < INTRO_TOTAL_BITMAPS; i++)
mBitmap[i]->update(); mBitmap[i]->update();
for (int i = 0; i < INTRO_TOTAL_TEXTS; i++) for (int i = 0; i < INTRO_TOTAL_TEXTS; i++)
mText[i]->update(); mWriter[i]->update();
// Guión de eventos // Guión de eventos
// Primera imagen - UPV // Primera imagen - UPV
@@ -253,23 +254,23 @@ section_t Intro::run()
// Primer texto de la primera imagen // Primer texto de la primera imagen
if ((mEvents[BITMAP0] == EVENT_COMPLETED) && (mEvents[TEXT0] == EVENT_WAITING)) if ((mEvents[BITMAP0] == EVENT_COMPLETED) && (mEvents[TEXT0] == EVENT_WAITING))
{ {
mText[0]->setEnabled(true); mWriter[0]->setEnabled(true);
mEvents[TEXT0] = EVENT_RUNNING; mEvents[TEXT0] = EVENT_RUNNING;
} }
// Segundo texto de la primera imagen // Segundo texto de la primera imagen
if ((mEvents[TEXT0] == EVENT_COMPLETED) && (mEvents[TEXT1] == EVENT_WAITING)) if ((mEvents[TEXT0] == EVENT_COMPLETED) && (mEvents[TEXT1] == EVENT_WAITING))
{ {
mText[0]->setEnabled(false); mWriter[0]->setEnabled(false);
mText[1]->setEnabled(true); mWriter[1]->setEnabled(true);
mEvents[TEXT1] = EVENT_RUNNING; mEvents[TEXT1] = EVENT_RUNNING;
} }
// Tercer texto de la primera imagen // Tercer texto de la primera imagen
if ((mEvents[TEXT1] == EVENT_COMPLETED) && (mEvents[TEXT2] == EVENT_WAITING)) if ((mEvents[TEXT1] == EVENT_COMPLETED) && (mEvents[TEXT2] == EVENT_WAITING))
{ {
mText[1]->setEnabled(false); mWriter[1]->setEnabled(false);
mText[2]->setEnabled(true); mWriter[2]->setEnabled(true);
mEvents[TEXT2] = EVENT_RUNNING; mEvents[TEXT2] = EVENT_RUNNING;
} }
@@ -277,7 +278,7 @@ section_t Intro::run()
if ((mEvents[TEXT2] == EVENT_COMPLETED) && (mEvents[BITMAP1] == EVENT_WAITING)) if ((mEvents[TEXT2] == EVENT_COMPLETED) && (mEvents[BITMAP1] == EVENT_WAITING))
{ {
mBitmap[0]->setEnabled(false); mBitmap[0]->setEnabled(false);
mText[2]->setEnabled(false); mWriter[2]->setEnabled(false);
mBitmap[1]->setEnabled(true); mBitmap[1]->setEnabled(true);
mEvents[BITMAP1] = EVENT_RUNNING; mEvents[BITMAP1] = EVENT_RUNNING;
} }
@@ -285,7 +286,7 @@ section_t Intro::run()
// Primer texto de la segunda imagen // Primer texto de la segunda imagen
if ((mEvents[BITMAP1] == EVENT_COMPLETED) && (mEvents[TEXT3] == EVENT_WAITING)) if ((mEvents[BITMAP1] == EVENT_COMPLETED) && (mEvents[TEXT3] == EVENT_WAITING))
{ {
mText[3]->setEnabled(true); mWriter[3]->setEnabled(true);
mEvents[TEXT3] = EVENT_RUNNING; mEvents[TEXT3] = EVENT_RUNNING;
} }
@@ -293,9 +294,9 @@ section_t Intro::run()
if ((mEvents[TEXT3] == EVENT_COMPLETED) && (mEvents[BITMAP2] == EVENT_WAITING) && (mEvents[TEXT4] == EVENT_WAITING)) if ((mEvents[TEXT3] == EVENT_COMPLETED) && (mEvents[BITMAP2] == EVENT_WAITING) && (mEvents[TEXT4] == EVENT_WAITING))
{ {
mBitmap[1]->setEnabled(false); mBitmap[1]->setEnabled(false);
mText[3]->setEnabled(false); mWriter[3]->setEnabled(false);
mBitmap[2]->setEnabled(true); mBitmap[2]->setEnabled(true);
mText[4]->setEnabled(true); mWriter[4]->setEnabled(true);
mEvents[BITMAP2] = EVENT_RUNNING; mEvents[BITMAP2] = EVENT_RUNNING;
mEvents[TEXT4] = EVENT_RUNNING; mEvents[TEXT4] = EVENT_RUNNING;
} }
@@ -304,9 +305,9 @@ section_t Intro::run()
if ((mEvents[TEXT4] == EVENT_COMPLETED) && (mEvents[BITMAP3] == EVENT_WAITING) && (mEvents[TEXT5] == EVENT_WAITING)) if ((mEvents[TEXT4] == EVENT_COMPLETED) && (mEvents[BITMAP3] == EVENT_WAITING) && (mEvents[TEXT5] == EVENT_WAITING))
{ {
mBitmap[2]->setEnabled(false); mBitmap[2]->setEnabled(false);
mText[4]->setEnabled(false); mWriter[4]->setEnabled(false);
mBitmap[3]->setEnabled(true); mBitmap[3]->setEnabled(true);
mText[5]->setEnabled(true); mWriter[5]->setEnabled(true);
mEvents[BITMAP3] = EVENT_RUNNING; mEvents[BITMAP3] = EVENT_RUNNING;
mEvents[TEXT5] = EVENT_RUNNING; mEvents[TEXT5] = EVENT_RUNNING;
} }
@@ -314,8 +315,8 @@ section_t Intro::run()
// Segundo texto de la cuarta imagen // Segundo texto de la cuarta imagen
if ((mEvents[TEXT5] == EVENT_COMPLETED) && (mEvents[TEXT6] == EVENT_WAITING)) if ((mEvents[TEXT5] == EVENT_COMPLETED) && (mEvents[TEXT6] == EVENT_WAITING))
{ {
mText[5]->setEnabled(false); mWriter[5]->setEnabled(false);
mText[6]->setEnabled(true); mWriter[6]->setEnabled(true);
mEvents[TEXT6] = EVENT_RUNNING; mEvents[TEXT6] = EVENT_RUNNING;
} }
@@ -323,7 +324,7 @@ section_t Intro::run()
if ((mEvents[TEXT6] == EVENT_COMPLETED) && (mEvents[BITMAP4] == EVENT_WAITING)) if ((mEvents[TEXT6] == EVENT_COMPLETED) && (mEvents[BITMAP4] == EVENT_WAITING))
{ {
mBitmap[3]->setEnabled(false); mBitmap[3]->setEnabled(false);
mText[6]->setEnabled(false); mWriter[6]->setEnabled(false);
mBitmap[4]->setEnabled(true); mBitmap[4]->setEnabled(true);
mEvents[BITMAP4] = EVENT_RUNNING; mEvents[BITMAP4] = EVENT_RUNNING;
} }
@@ -331,7 +332,7 @@ section_t Intro::run()
// Primer texto de la quinta imagen // Primer texto de la quinta imagen
if ((mEvents[BITMAP4] == EVENT_COMPLETED) && (mEvents[TEXT7] == EVENT_WAITING)) if ((mEvents[BITMAP4] == EVENT_COMPLETED) && (mEvents[TEXT7] == EVENT_WAITING))
{ {
mText[7]->setEnabled(true); mWriter[7]->setEnabled(true);
mEvents[TEXT7] = EVENT_RUNNING; mEvents[TEXT7] = EVENT_RUNNING;
} }
@@ -339,9 +340,9 @@ section_t Intro::run()
if ((mEvents[TEXT7] == EVENT_COMPLETED) && (mEvents[BITMAP5] == EVENT_WAITING) && (mEvents[TEXT8] == EVENT_WAITING)) if ((mEvents[TEXT7] == EVENT_COMPLETED) && (mEvents[BITMAP5] == EVENT_WAITING) && (mEvents[TEXT8] == EVENT_WAITING))
{ {
mBitmap[4]->setEnabled(false); mBitmap[4]->setEnabled(false);
mText[7]->setEnabled(false); mWriter[7]->setEnabled(false);
mBitmap[5]->setEnabled(true); mBitmap[5]->setEnabled(true);
mText[8]->setEnabled(true); mWriter[8]->setEnabled(true);
mEvents[BITMAP5] = EVENT_RUNNING; mEvents[BITMAP5] = EVENT_RUNNING;
mEvents[TEXT8] = EVENT_RUNNING; mEvents[TEXT8] = EVENT_RUNNING;
} }
@@ -349,7 +350,7 @@ section_t Intro::run()
// Acaba el último texto // Acaba el último texto
if (mEvents[TEXT8] == EVENT_COMPLETED) if (mEvents[TEXT8] == EVENT_COMPLETED)
{ {
mText[8]->setEnabled(false); mWriter[8]->setEnabled(false);
JA_StopMusic(); JA_StopMusic();
mSection = {PROG_SECTION_TITLE, TITLE_SECTION_1}; mSection = {PROG_SECTION_TITLE, TITLE_SECTION_1};
} }
@@ -363,7 +364,7 @@ section_t Intro::run()
for (int i = 0; i < INTRO_TOTAL_BITMAPS; i++) for (int i = 0; i < INTRO_TOTAL_BITMAPS; i++)
mBitmap[i]->render(); mBitmap[i]->render();
for (int i = 0; i < INTRO_TOTAL_TEXTS; i++) for (int i = 0; i < INTRO_TOTAL_TEXTS; i++)
mText[i]->render(); mWriter[i]->render();
// Actualiza la pantalla // Actualiza la pantalla
SDL_RenderPresent(mRenderer); SDL_RenderPresent(mRenderer);

5
source/intro.h
View File

@@ -4,7 +4,7 @@
#include "utils.h" #include "utils.h"
#include "smartsprite.h" #include "smartsprite.h"
#include "text2.h" #include "writer.h"
#include "jail_audio.h" #include "jail_audio.h"
#ifndef INTRO_H #ifndef INTRO_H
@@ -24,7 +24,8 @@ private:
Uint32 mTicks; // Contador de ticks para ajustar la velocidad del programa Uint32 mTicks; // Contador de ticks para ajustar la velocidad del programa
Uint8 mTicksSpeed; // Velocidad a la que se repiten los bucles del programa Uint8 mTicksSpeed; // Velocidad a la que se repiten los bucles del programa
SmartSprite *mBitmap[INTRO_TOTAL_BITMAPS]; // Vector con los sprites inteligentes para los dibujos de la intro SmartSprite *mBitmap[INTRO_TOTAL_BITMAPS]; // Vector con los sprites inteligentes para los dibujos de la intro
Text2 *mText[INTRO_TOTAL_TEXTS]; // Textos de la intro Writer *mWriter[INTRO_TOTAL_TEXTS]; // Textos de la intro
Text *mText; // Textos de la intro
Uint8 mEvents[INTRO_TOTAL_EVENTS]; // Vector para coordinar los eventos de la intro Uint8 mEvents[INTRO_TOTAL_EVENTS]; // Vector para coordinar los eventos de la intro
JA_Music mMusic; // Musica para la intro JA_Music mMusic; // Musica para la intro

2
source/text.cpp
View File

@@ -10,6 +10,8 @@ Text::Text(std::string file, LTexture *texture, SDL_Renderer *renderer)
mSprite->setTexture(texture); mSprite->setTexture(texture);
mSprite->setRenderer(renderer); mSprite->setRenderer(renderer);
mFile = file; mFile = file;
init();
} }
// Destructor // Destructor

4
source/title.cpp
View File

@@ -129,8 +129,8 @@ void Title::init(bool demo, Uint8 subsection)
mPostFade = 0; mPostFade = 0;
mTicks = 0; mTicks = 0;
mTicksSpeed = 15; mTicksSpeed = 15;
mText->init(); //mText->init();
mText2->init(); //mText2->init();
mFade->init(0x00, 0x00, 0x00); mFade->init(0x00, 0x00, 0x00);
mDemo = demo; mDemo = demo;

34
source/writer.cpp
View File

@@ -2,8 +2,9 @@
#include "writer.h" #include "writer.h"
// Constructor // Constructor
Writer::Writer(std::string file, LTexture *texture, SDL_Renderer *renderer) Writer::Writer(Text *text)
{ {
mText = text;
} }
// Destructor // Destructor
@@ -14,16 +15,15 @@ Writer::~Writer()
// Inicializador // Inicializador
void Writer::init() void Writer::init()
{ {
Text::init();
mPosX = 0; mPosX = 0;
mPosY = 0; mPosY = 0;
mKerning = 0; mKerning = 0;
mCaption = ""; mCaption = "";
mWrittingSpeed = 0; mSpeed = 0;
mWrittingTimer = 0; mTimer = 0;
mIndex = 0; mIndex = 0;
mLenght = 0; mLenght = 0;
mWrittingCompleted = false; mCompleted = false;
mEnabled = false; mEnabled = false;
mEnabledTimer = 0; mEnabledTimer = 0;
mId = -1; mId = -1;
@@ -56,10 +56,10 @@ void Writer::setCaption(std::string text)
} }
// Establece el valor de la variable // Establece el valor de la variable
void Writer::setWrittingSpeed(Uint16 value) void Writer::setSpeed(Uint16 value)
{ {
mWrittingSpeed = value; mSpeed = value;
mWrittingTimer = value; mTimer = value;
} }
// Establece el valor de la variable // Establece el valor de la variable
@@ -91,23 +91,23 @@ void Writer::update()
{ {
if (mEnabled) if (mEnabled)
{ {
if (mWrittingCompleted == false) if (mCompleted == false)
{ {
if (mWrittingTimer > 0) if (mTimer > 0)
{ {
mWrittingTimer--; mTimer--;
} }
if (mWrittingTimer == 0) if (mTimer == 0)
{ {
mIndex++; mIndex++;
mWrittingTimer = mWrittingSpeed; mTimer = mSpeed;
} }
if (mIndex == mLenght) if (mIndex == mLenght)
{ {
mWrittingCompleted = true; mCompleted = true;
} }
} }
if (mWrittingCompleted) if (mCompleted)
{ {
if (mEnabledTimer > 0) if (mEnabledTimer > 0)
{ {
@@ -133,14 +133,14 @@ void Writer::render()
{ {
if (mEnabled) if (mEnabled)
{ {
Text::write(mPosX, mPosY, mCaption, mKerning, mIndex); mText->write(mPosX, mPosY, mCaption, mKerning, mIndex);
} }
} }
// Centra la cadena de texto a un punto X // Centra la cadena de texto a un punto X
void Writer::center(int x) void Writer::center(int x)
{ {
setPosX(x - (lenght(mCaption, mKerning) / 2)); setPosX(x - (mText->lenght(mCaption, mKerning) / 2));
} }
// Establece el valor de la variable // Establece el valor de la variable