Merge remote-tracking branch 'origin/main'

This commit is contained in:
Clément Fouché
2024-09-20 09:24:49 +02:00
2 changed files with 3 additions and 3 deletions

View File

@@ -36,7 +36,7 @@ private:
class Kelp {
public:
Kelp(int x, int y, int height, int width, Uint8 r, Uint8 g) : x(x), y(y), size(height), r(r), g(g) {};
Kelp(int x, int y, int height, Uint8 r, Uint8 g, Uint8 b) : x(x), y(y), size(height), r(r), g(g), b(b) {};
void draw(SDL_Renderer* renderer, int offsetX, int offsetY);
private:

4
fish.h
View File

@@ -7,8 +7,8 @@
#include <string>
#include <vector>
const int ENV_WIDTH = 3840;
const int ENV_HEIGHT = 2160;
const int ENV_WIDTH = 1920;
const int ENV_HEIGHT = 1080;
const int MARGIN_WIDTH = 100;
const int MARGIN_HEIGHT = 100;