From c3d5852143f3024417b0a5587732d3ee66c9f647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Mat=C4=9Bjka?= Date: Thu, 5 Mar 2026 19:13:30 +0100 Subject: [PATCH 1/3] Fix typos --- lectures/2026-03-05-PA2-intro/main.tex | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lectures/2026-03-05-PA2-intro/main.tex b/lectures/2026-03-05-PA2-intro/main.tex index 8c035d2..541b771 100644 --- a/lectures/2026-03-05-PA2-intro/main.tex +++ b/lectures/2026-03-05-PA2-intro/main.tex @@ -118,10 +118,10 @@ \section{OOP} \begin{minted}[fontsize=\small]{C} int create_player(player_t *player) { - player.name = malloc(...); - player.health = 3; - player.damage = 5; - player.state = ON_GROUND; + player->name = (char*)malloc(...); + player->health = 3; + player->damage = 5; + player->state = ON_GROUND; return 0; } @@ -196,8 +196,8 @@ \section{OOP} return player; } void Player::del() { - delete player.name; - player.name = nullptr; + delete[] name; + name = nullptr; } \end{minted} \end{column} @@ -232,7 +232,7 @@ \section{OOP} Player &heal(unsigned int amount) { unsigned int newhealth = this->health + amount; if (newhealth > 3) { - return; + return *this; } if (newhealth == 0) { printf("Player died!\n"); @@ -322,7 +322,7 @@ \section{OOP} class Player { ... ~Player() { - delete this->name; + delete[] this->name; this->name = nullptr; } } @@ -498,7 +498,7 @@ \section{Něco více k C++} // Může to být to samé jako // plusequals(p, 2) - // POZOR NA PRIORITĚ OPERACÍ + // POZOR NA PRIORITU OPERACÍ // (* má větší prioritu než +, // i když jejich chování prohodíme) } @@ -513,7 +513,7 @@ \section{Něco více k C++} class Player { ... Player &operator +=(unsigned int amount) { - this.heal(amount); + this->heal(amount); return *this; } bool operator +=(const Player &other) const { From db0cc30a29d0c85bc33d86b5207be8d7df029ead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Mat=C4=9Bjka?= <91016931+Dzendys@users.noreply.github.com> Date: Fri, 6 Mar 2026 00:52:21 +0100 Subject: [PATCH 2/3] Call user defined constructor instead of deleted implicit one Co-authored-by: Marek Vospel <73162071+marekvospel@users.noreply.github.com> --- lectures/2026-03-05-PA2-intro/main.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lectures/2026-03-05-PA2-intro/main.tex b/lectures/2026-03-05-PA2-intro/main.tex index 541b771..497895b 100644 --- a/lectures/2026-03-05-PA2-intro/main.tex +++ b/lectures/2026-03-05-PA2-intro/main.tex @@ -427,7 +427,7 @@ \section{Něco více k C++} int main() { int *numptr = new int(1); int *myarr = new int[5]{1, 2, 3}; - Player *plr = new Player(); + Player *plr = new Player(3, 2); delete numptr; delete[] myarr; From f814be7ee605fabb65932faa3323727a20cbb3b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Mat=C4=9Bjka?= <91016931+Dzendys@users.noreply.github.com> Date: Fri, 6 Mar 2026 00:53:04 +0100 Subject: [PATCH 3/3] Call user defined constructor instead of deleted implicit one Co-authored-by: Marek Vospel <73162071+marekvospel@users.noreply.github.com> --- lectures/2026-03-05-PA2-intro/main.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lectures/2026-03-05-PA2-intro/main.tex b/lectures/2026-03-05-PA2-intro/main.tex index 497895b..157d63a 100644 --- a/lectures/2026-03-05-PA2-intro/main.tex +++ b/lectures/2026-03-05-PA2-intro/main.tex @@ -490,7 +490,7 @@ \section{Něco více k C++} \begin{minted}{Cpp} int main() { - Player p = Player(); + Player p = Player(3, 4); // Co dělá bin. operátor +=? // Zkracuje nám zápis nějáké funkce