jaildesigner-jailgames/coffee_crisis_arcade_edition
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 13 Wiki Activity

Corregido bug en el FADE_RANDOM_SQUARE al acceder a elementos fuera del vector

Browse Source
This commit is contained in:
Sergio
2024-06-24 09:43:27 +02:00
parent 895955f122
commit c8d1e79e1d
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@@ -23,16 +23,18 @@ INCLUDES:= -I$(DIR_SOURCES)
# Variables según el sistema operativo # Variables según el sistema operativo
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
FixPath = $(subst /,\,$1)
SOURCES := source/*.cpp source/common/*.cpp SOURCES := source/*.cpp source/common/*.cpp
CXXFLAGS:= -std=c++11 -Wall -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows CXXFLAGS:= -std=c++11 -Wall -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows
LDFLAGS := -lmingw32 -lws2_32 -lSDL2main -lSDL2 LDFLAGS := -lmingw32 -lws2_32 -lSDL2main -lSDL2
RM:= rmdir /Q /S RM = del /Q
MKD:= MKD:= mkdir
else else
FixPath = $1
SOURCES := $(shell find $(DIR_SOURCES) -name '*.cpp') SOURCES := $(shell find $(DIR_SOURCES) -name '*.cpp')
CXXFLAGS:= -std=c++11 -Wall -Os -ffunction-sections -fdata-sections CXXFLAGS:= -std=c++11 -Wall -Os -ffunction-sections -fdata-sections
LDFLAGS := -lSDL2 LDFLAGS := -lSDL2
RM:= rm -rdf RM = rm -f
MKD:= mkdir -p MKD:= mkdir -p
endif endif
@@ -54,11 +56,11 @@ all: a1
a1: $(TARGET_FILE) a1: $(TARGET_FILE)
$(TARGET_FILE): $(OBJECTS) $(TARGET_FILE): $(OBJECTS)
mkdir -p $(@D) $(MKD) $(@D)
$(CXX) $(OBJECTS) $(LDFLAGS) -o $(TARGET_FILE) $(CXX) $(OBJECTS) $(LDFLAGS) -o $(TARGET_FILE)
$(DIR_BUILD)%.o: $(DIR_SOURCES)%.cpp $(DIR_BUILD)%.o: $(DIR_SOURCES)%.cpp
mkdir -p $(@D) $(MKD) $(@D)
$(CXX) -c $< $(CXXFLAGS) $(INCLUDES) -o $@ $(CXX) -c $< $(CXXFLAGS) $(INCLUDES) -o $@
-include $(DEPENDENCIES) -include $(DEPENDENCIES)
@@ -72,7 +74,7 @@ $(DIR_BUILD)%.o: $(DIR_SOURCES)%.cpp
.PHONY: clean .PHONY: clean
clean: clean:
$(RM) $(DIR_BUILD) $(RM) $(call FixPath,$(DIR_BUILD))
############################################################################### ###############################################################################
# # # #

3
source/fade.cpp
View File

@@ -133,7 +133,8 @@ void Fade::update()
const int index = std::min(counter / fadeRandomSquaresDelay, (numSquaresWidth * numSquaresHeight) - 1); const int index = std::min(counter / fadeRandomSquaresDelay, (numSquaresWidth * numSquaresHeight) - 1);
for (int i = 0; i < fadeRandomSquaresMult; ++i) for (int i = 0; i < fadeRandomSquaresMult; ++i)
{ {
SDL_RenderFillRect(renderer, &square[index * fadeRandomSquaresMult + i]); const int index2 = std::min(index * fadeRandomSquaresMult + i, (int)square.size() - 1);
SDL_RenderFillRect(renderer, &square[index2]);
} }
// Volvemos a usar el renderizador de forma normal // Volvemos a usar el renderizador de forma normal