diff --git a/source/common/menu.cpp b/source/common/menu.cpp index d0b96b3..e44cab8 100644 --- a/source/common/menu.cpp +++ b/source/common/menu.cpp @@ -458,7 +458,7 @@ void Menu::setSelectorPos(int index) if (index < (int)item.size()) { selector.index = index; - selector.rect.y = selector.y = selector.originY = selector.targetY = item.at(selector.index).rect.y; + selector.rect.y = selector.y = selector.originY = selector.targetY = item[selector.index].rect.y; selector.rect.w = rectBG.rect.w; selector.rect.x = rectBG.rect.x; selector.originH = selector.targetH = selector.rect.h = getSelectorHeight(selector.index); @@ -486,13 +486,13 @@ void Menu::reset() { itemSelected = MENU_NO_OPTION; selector.index = 0; - selector.originY = selector.targetY = selector.y = item.at(0).rect.y; - selector.originH = selector.targetH = item.at(0).rect.h; + selector.originY = selector.targetY = selector.y = item[0].rect.y; + selector.originH = selector.targetH = item[0].rect.h; selector.moving = false; selector.resizing = false; // Si el primer elemento no es seleccionable, incrementa el selector - if (!item.at(selector.index).selectable) + if (!item[selector.index].selectable) { increaseSelectorIndex(); setSelectorPos(selector.index); @@ -524,18 +524,18 @@ void Menu::reorganize() bool Menu::increaseSelectorIndex() { // Obten las coordenadas del elemento actual - selector.y = selector.originY = item.at(selector.index).rect.y; + selector.y = selector.originY = item[selector.index].rect.y; selector.h = selector.originH = getSelectorHeight(selector.index); // Calcula cual es el siguiente elemento ++selector.index %= item.size(); - while (!item.at(selector.index).selectable) + while (!item[selector.index].selectable) { ++selector.index %= item.size(); } // Establece las coordenadas y altura de destino - selector.targetY = item.at(selector.index).rect.y; + selector.targetY = item[selector.index].rect.y; selector.despY = (selector.targetY - selector.originY) / selector.numJumps; selector.targetH = getSelectorHeight(selector.index); @@ -554,7 +554,7 @@ bool Menu::increaseSelectorIndex() bool Menu::decreaseSelectorIndex() { // Obten las coordenadas del elemento actual - selector.y = selector.originY = item.at(selector.index).rect.y; + selector.y = selector.originY = item[selector.index].rect.y; selector.h = selector.originH = getSelectorHeight(selector.index); // Calcula cual es el siguiente elemento @@ -567,7 +567,7 @@ bool Menu::decreaseSelectorIndex() selector.index--; } - while (!item.at(selector.index).selectable) + while (!item[selector.index].selectable) { if (selector.index == 0) { @@ -580,7 +580,7 @@ bool Menu::decreaseSelectorIndex() } // Establece las coordenadas y altura de destino - selector.targetY = item.at(selector.index).rect.y; + selector.targetY = item[selector.index].rect.y; selector.despY = (selector.targetY - selector.originY) / selector.numJumps; selector.targetH = getSelectorHeight(selector.index); @@ -630,29 +630,29 @@ void Menu::render() if (i == selector.index) { const color_t color = {selector.itemColor.r, selector.itemColor.g, selector.itemColor.b}; - text->writeColored(item.at(i).rect.x, item.at(i).rect.y, item.at(i).label, color); + text->writeColored(item[i].rect.x, item[i].rect.y, item[i].label, color); } - else if (item.at(i).selectable) + else if (item[i].selectable) { - text->write(item.at(i).rect.x, item.at(i).rect.y, item.at(i).label); + text->write(item[i].rect.x, item[i].rect.y, item[i].label); } - else if (item.at(i).greyed) + else if (item[i].greyed) { - text->writeColored(item.at(i).rect.x, item.at(i).rect.y, item.at(i).label, colorGreyed); + text->writeColored(item[i].rect.x, item[i].rect.y, item[i].label, colorGreyed); } else { // No seleccionable - if ((item.at(i).linkedUp) && (i == selector.index + 1)) + if ((item[i].linkedUp) && (i == selector.index + 1)) { const color_t color = {selector.itemColor.r, selector.itemColor.g, selector.itemColor.b}; - text->writeColored(item.at(i).rect.x, item.at(i).rect.y, item.at(i).label, color); + text->writeColored(item[i].rect.x, item[i].rect.y, item[i].label, color); } else // No enlazado con el de arriba { - text->write(item.at(i).rect.x, item.at(i).rect.y, item.at(i).label); + text->write(item[i].rect.x, item[i].rect.y, item[i].label); } } } @@ -822,7 +822,7 @@ void Menu::addItem(std::string text, int hPaddingDown, bool selectable, bool gre if (item.size() > 1) { - if (item.at(item.size() - 2).linkedDown) + if (item[item.size() - 2].linkedDown) { item.back().linkedUp = true; } @@ -835,9 +835,9 @@ void Menu::addItem(std::string text, int hPaddingDown, bool selectable, bool gre // Cambia el texto de un item void Menu::setItemCaption(int index, std::string text) { - item.at(index).label = text; - item.at(index).rect.w = this->text->lenght(item.at(index).label); - item.at(index).rect.h = this->text->getCharacterSize(); + item[index].label = text; + item[index].rect.w = this->text->lenght(item[index].label); + item[index].rect.h = this->text->getCharacterSize(); reorganize(); } @@ -914,42 +914,42 @@ int Menu::findHeight() // Recoloca los elementos del menu en el eje Y void Menu::replaceElementsOnY() { - item.at(0).rect.y = y; + item[0].rect.y = y; for (int i = 1; i < (int)item.size(); i++) { - item.at(i).rect.y = item.at(i - 1).rect.y + item.at(i - 1).rect.h + item.at(i - 1).hPaddingDown; + item[i].rect.y = item[i - 1].rect.y + item[i - 1].rect.h + item[i - 1].hPaddingDown; } } // Establece el estado seleccionable de un item void Menu::setSelectable(int index, bool value) { - item.at(index).selectable = value; + item[index].selectable = value; } // Establece el estado agrisado de un item void Menu::setGreyed(int index, bool value) { - item.at(index).greyed = value; + item[index].greyed = value; } // Establece el estado de enlace de un item void Menu::setLinkedDown(int index, bool value) { - item.at(index).linkedDown = value; + item[index].linkedDown = value; } // Calcula la altura del selector int Menu::getSelectorHeight(int value) { - if (item.at(value).linkedDown) + if (item[value].linkedDown) { - return item.at(value).rect.h + item.at(value).hPaddingDown + item.at(value + 1).rect.h; + return item[value].rect.h + item[value].hPaddingDown + item[value + 1].rect.h; } else { - return item.at(value).rect.h; + return item[value].rect.h; } } diff --git a/source/demo.cpp b/source/demo.cpp index a46aafd..ac3a820 100644 --- a/source/demo.cpp +++ b/source/demo.cpp @@ -15,7 +15,7 @@ Demo::Demo(SDL_Renderer *renderer, Screen *screen, Resource *resource, Asset *as rooms.push_back("44.room"); roomIndex = 0; - currentRoom = rooms.at(roomIndex); + currentRoom = rooms[roomIndex]; // Copia los punteros this->resource = resource; @@ -260,7 +260,7 @@ void Demo::checkRoomChange() } else { - changeRoom(rooms.at(roomIndex)); + changeRoom(rooms[roomIndex]); } } } diff --git a/source/ending.cpp b/source/ending.cpp index da0fc65..656ba35 100644 --- a/source/ending.cpp +++ b/source/ending.cpp @@ -119,16 +119,16 @@ void Ending::render() screen->clean(stringToColor(options->palette, "black")); // Dibuja las imagenes de la escena - spritePics.at(scene).sprite->render(); - spritePics.at(scene).coverSprite->render(); + spritePics[scene].sprite->render(); + spritePics[scene].coverSprite->render(); // Dibuja los textos de la escena - for (auto ti : scenes.at(scene).textIndex) + for (auto ti : scenes[scene].textIndex) { if (counter > ti.trigger) { - spriteTexts.at(ti.index).sprite->render(); - spriteTexts.at(ti.index).coverSprite->render(); + spriteTexts[ti.index].sprite->render(); + spriteTexts[ti.index].coverSprite->render(); } } @@ -511,7 +511,7 @@ void Ending::updateCounters() counter++; } - if (counter > scenes.at(scene).counterEnd - 100) + if (counter > scenes[scene].counterEnd - 100) { coverCounter++; } @@ -522,20 +522,20 @@ void Ending::updateSpriteCovers() { // Actualiza la cortinilla de los textos if (counter % 4 == 0) { - for (auto ti : scenes.at(scene).textIndex) + for (auto ti : scenes[scene].textIndex) { if (counter > ti.trigger) { - if (spriteTexts.at(ti.index).clipDesp > 0) + if (spriteTexts[ti.index].clipDesp > 0) { - spriteTexts.at(ti.index).clipDesp -= 2; + spriteTexts[ti.index].clipDesp -= 2; } - else if (spriteTexts.at(ti.index).clipHeight > 0) + else if (spriteTexts[ti.index].clipHeight > 0) { - spriteTexts.at(ti.index).clipHeight -= 2; - spriteTexts.at(ti.index).coverSprite->setPosY(spriteTexts.at(ti.index).coverSprite->getPosY() + 2); + spriteTexts[ti.index].clipHeight -= 2; + spriteTexts[ti.index].coverSprite->setPosY(spriteTexts[ti.index].coverSprite->getPosY() + 2); } - spriteTexts.at(ti.index).coverSprite->setSpriteClip(0, spriteTexts.at(ti.index).clipDesp, spriteTexts.at(ti.index).coverSprite->getWidth(), spriteTexts.at(ti.index).clipHeight); + spriteTexts[ti.index].coverSprite->setSpriteClip(0, spriteTexts[ti.index].clipDesp, spriteTexts[ti.index].coverSprite->getWidth(), spriteTexts[ti.index].clipHeight); } } } @@ -543,27 +543,27 @@ void Ending::updateSpriteCovers() // Actualiza la cortinilla de las imagenes if (counter % 2 == 0) { - if (spritePics.at(scene).clipDesp > 0) + if (spritePics[scene].clipDesp > 0) { - spritePics.at(scene).clipDesp -= 2; + spritePics[scene].clipDesp -= 2; } - else if (spritePics.at(scene).clipHeight > 0) + else if (spritePics[scene].clipHeight > 0) { - spritePics.at(scene).clipHeight -= 2; - if (spritePics.at(scene).clipHeight < 0) + spritePics[scene].clipHeight -= 2; + if (spritePics[scene].clipHeight < 0) { - spritePics.at(scene).clipHeight = 0; + spritePics[scene].clipHeight = 0; } - spritePics.at(scene).coverSprite->setPosY(spritePics.at(scene).coverSprite->getPosY() + 2); + spritePics[scene].coverSprite->setPosY(spritePics[scene].coverSprite->getPosY() + 2); } - spritePics.at(scene).coverSprite->setSpriteClip(0, spritePics.at(scene).clipDesp, spritePics.at(scene).coverSprite->getWidth(), spritePics.at(scene).clipHeight); + spritePics[scene].coverSprite->setSpriteClip(0, spritePics[scene].clipDesp, spritePics[scene].coverSprite->getWidth(), spritePics[scene].clipHeight); } } // Comprueba si se ha de cambiar de escena void Ending::checkChangeScene() { - if (counter > scenes.at(scene).counterEnd) + if (counter > scenes[scene].counterEnd) { scene++; counter = 0; @@ -639,20 +639,20 @@ void Ending::switchPalette() { options->palette = p_zxarne; - spritePics.at(0).sprite->setTexture(resource->getTexture("ending1_zxarne.png")); - spritePics.at(1).sprite->setTexture(resource->getTexture("ending2_zxarne.png")); - spritePics.at(2).sprite->setTexture(resource->getTexture("ending3_zxarne.png")); - spritePics.at(3).sprite->setTexture(resource->getTexture("ending4_zxarne.png")); - spritePics.at(4).sprite->setTexture(resource->getTexture("ending5_zxarne.png")); + spritePics[0].sprite->setTexture(resource->getTexture("ending1_zxarne.png")); + spritePics[1].sprite->setTexture(resource->getTexture("ending2_zxarne.png")); + spritePics[2].sprite->setTexture(resource->getTexture("ending3_zxarne.png")); + spritePics[3].sprite->setTexture(resource->getTexture("ending4_zxarne.png")); + spritePics[4].sprite->setTexture(resource->getTexture("ending5_zxarne.png")); } else { options->palette = p_zxspectrum; - spritePics.at(0).sprite->setTexture(resource->getTexture("ending1.png")); - spritePics.at(1).sprite->setTexture(resource->getTexture("ending2.png")); - spritePics.at(2).sprite->setTexture(resource->getTexture("ending3.png")); - spritePics.at(3).sprite->setTexture(resource->getTexture("ending4.png")); - spritePics.at(4).sprite->setTexture(resource->getTexture("ending5.png")); + spritePics[0].sprite->setTexture(resource->getTexture("ending1.png")); + spritePics[1].sprite->setTexture(resource->getTexture("ending2.png")); + spritePics[2].sprite->setTexture(resource->getTexture("ending3.png")); + spritePics[3].sprite->setTexture(resource->getTexture("ending4.png")); + spritePics[4].sprite->setTexture(resource->getTexture("ending5.png")); } } \ No newline at end of file diff --git a/source/ending2.cpp b/source/ending2.cpp index 6712593..bd5b2c0 100644 --- a/source/ending2.cpp +++ b/source/ending2.cpp @@ -469,13 +469,13 @@ void Ending2::placeSprites() { const int x = i % 2 == 0 ? firstCol : secondCol; const int y = (i / 1) * (maxSpriteHeight + distSpriteText + text->getCharacterSize() + distSpriteSprite) + GAMECANVAS_HEIGHT + 40; - const int w = sprites.at(i)->getAnimationClip(0, 0).w; - const int h = sprites.at(i)->getAnimationClip(0, 0).h; + const int w = sprites[i]->getAnimationClip(0, 0).w; + const int h = sprites[i]->getAnimationClip(0, 0).h; const int dx = -(w / 2); const int dy = i % 1 == 0 ? maxSpriteHeight - h : (int)(maxSpriteHeight * 1.5f) - h; - sprites.at(i)->setRect({x + dx, y + dy, w, h}); - sprites.at(i)->setVelY(despSpeed); + sprites[i]->setRect({x + dx, y + dy, w, h}); + sprites[i]->setVelY(despSpeed); } // Recoloca el último sprite, que es el del jugador @@ -497,14 +497,14 @@ void Ending2::createSpriteTexts() for (int i = 0; i < (int)spriteList.size(); ++i) { // Calcula constantes - std::string txt = spriteList.at(i); + std::string txt = spriteList[i]; std::replace(txt.begin(), txt.end(), '_', ' '); txt = txt == "player" ? "JAILDOCTOR" : txt; // Reemplaza el texto const int w = text->lenght(txt, 1); const int h = text->getCharacterSize(); const int x = i % 2 == 0 ? firstCol : secondCol; const int dx = -(w / 2); - const int y = sprites.at(i)->getPosY() + sprites.at(i)->getHeight() + distSpriteText; + const int y = sprites[i]->getPosY() + sprites[i]->getHeight() + distSpriteText; // Cambia la posición del último sprite const int X = (i == (int)spriteList.size() - 1) ? GAMECANVAS_CENTER_X - (w / 2) : x + dx; @@ -536,7 +536,7 @@ void Ending2::createTexts() for (int i = 0; i < (int)list.size(); ++i) { // Calcula constantes - const int w = text->lenght(list.at(i), 1); + const int w = text->lenght(list[i], 1); const int h = text->getCharacterSize(); const int x = GAMECANVAS_CENTER_X; const int dx = -(w / 2); @@ -547,7 +547,7 @@ void Ending2::createTexts() texture->createBlank(renderer, w, h, SDL_TEXTUREACCESS_TARGET); texture->setAsRenderTarget(renderer); texture->setBlendMode(SDL_BLENDMODE_BLEND); - text->write(0, 0, list.at(i)); + text->write(0, 0, list[i]); // Crea el sprite MovingSprite *sprite = new MovingSprite(x + dx, y, w, h, 0.0f, despSpeed, 0.0f, 0.0f, texture, renderer); @@ -565,7 +565,7 @@ void Ending2::createTexts() for (int i = 0; i < (int)list.size(); ++i) { // Calcula constantes - const int w = text->lenght(list.at(i), 1); + const int w = text->lenght(list[i], 1); const int h = text->getCharacterSize(); const int x = GAMECANVAS_CENTER_X; const int dx = -(w / 2); @@ -576,7 +576,7 @@ void Ending2::createTexts() texture->createBlank(renderer, w, h, SDL_TEXTUREACCESS_TARGET); texture->setAsRenderTarget(renderer); texture->setBlendMode(SDL_BLENDMODE_BLEND); - text->write(0, 0, list.at(i)); + text->write(0, 0, list[i]); // Crea el sprite MovingSprite *sprite = new MovingSprite(x + dx, y, w, h, 0.0f, despSpeed, 0.0f, 0.0f, texture, renderer); @@ -624,7 +624,7 @@ void Ending2::updateFinalFade() for (auto t : texts) { - t->getTexture()->setColor(colors.at(index).r, colors.at(index).g, colors.at(index).b); + t->getTexture()->setColor(colors[index].r, colors[index].g, colors[index].b); } } diff --git a/source/game_over.cpp b/source/game_over.cpp index 9c5b2f2..4128f77 100644 --- a/source/game_over.cpp +++ b/source/game_over.cpp @@ -198,13 +198,13 @@ void GameOver::updateColor() // const float step = std::min(std::max(counter, iniFade) - iniFade, fadeLenght) / (float)fadeLenght; const float step = std::min(counter, fadeLenght) / (float)fadeLenght; const int index = (colors.size() - 1) - int((colors.size() - 1) * step); - color = colors.at(index); + color = colors[index]; } else { const float step = std::min(std::max(counter, iniFade) - iniFade, fadeLenght) / (float)fadeLenght; const int index = (colors.size() - 1) * step; - color = colors.at(index); + color = colors[index]; } } diff --git a/source/stats.cpp b/source/stats.cpp index ab4695f..85e39e7 100644 --- a/source/stats.cpp +++ b/source/stats.cpp @@ -60,7 +60,7 @@ void Stats::addDeath(std::string name) const int index = findByName(name, bufferList); if (index != -1) { - bufferList.at(index).died++; + bufferList[index].died++; } // En caso contrario crea la entrada @@ -84,7 +84,7 @@ void Stats::addVisit(std::string name) const int index = findByName(name, bufferList); if (index != -1) { - bufferList.at(index).visited++; + bufferList[index].visited++; } // En caso contrario crea la entrada @@ -304,8 +304,8 @@ void Stats::updateListFromBuffer() if (index != -1) { // Encontrado. Aumenta sus estadisticas - list.at(index).visited += buffer.visited; - list.at(index).died += buffer.died; + list[index].visited += buffer.visited; + list[index].died += buffer.died; } else { // En caso contrario crea la entrada