Skip to content
This repository was archived by the owner on Feb 11, 2022. It is now read-only.

Commit 9742350

Browse files
committed
Removido: alguns log's de teste
1 parent 5b7fe60 commit 9742350

5 files changed

Lines changed: 12 additions & 29 deletions

File tree

Source/src/FreeCell.layout

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Top=0
88
[Editors]
99
Order=-1,2,14,4,0
1010
<<<<<<< Updated upstream
11-
Focused=-1
11+
Focused=2
1212
=======
1313
Focused=-1
1414
>>>>>>> Stashed changes
@@ -21,11 +21,11 @@ TopLine=1
2121
LeftChar=1
2222
[Editor_2]
2323
Open=1
24-
Top=0
25-
CursorCol=76
26-
CursorRow=164
27-
TopLine=134
28-
LeftChar=23
24+
Top=1
25+
CursorCol=69
26+
CursorRow=93
27+
TopLine=68
28+
LeftChar=1
2929
[Editor_3]
3030
Open=0
3131
Top=0
@@ -36,9 +36,9 @@ LeftChar=1
3636
[Editor_4]
3737
Open=1
3838
Top=0
39-
CursorCol=1
40-
CursorRow=5
41-
TopLine=5
39+
CursorCol=32
40+
CursorRow=84
41+
TopLine=67
4242
LeftChar=1
4343
[Editor_5]
4444
Open=1
@@ -70,7 +70,7 @@ TopLine=20
7070
LeftChar=1
7171
[Editor_9]
7272
Open=1
73-
Top=1
73+
Top=0
7474
CursorCol=105
7575
CursorRow=29
7676
TopLine=16

Source/src/eventmanager.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,10 @@ void EventManager::mouseLeftUp() {
8787
abc = false;
8888
stack_temp.pop(card_temp);
8989
card_temp.setStateHover(false);
90-
if (this->stack_joining) {
91-
SDL_Log("before");
90+
if (this->stack_joining)
9291
this->stack_joining->pushChild(card_temp, abc);
93-
SDL_Log("after");
94-
}
9592

96-
SDL_Log("%s %s", abc ? "abc" : "!abc", this->stack_joining ? "joining" : "!joining");
93+
SDL_Log("%s %s", abc ? "ok" : "!ok", this->stack_joining ? "target" : "!target");
9794
if (!this->stack_joining || !abc)
9895
this->previous_stack->push(card_temp, abc);
9996
}

Source/src/main.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,27 +65,13 @@ int main(int argv, char** args) {
6565

6666
PilhaUnica p_u[4]; // Pilha de carta �nica
6767
for (int i = 0; i < 4; i++) {
68-
if (i == 0) {
69-
Carta c(1, gRenderer);
70-
p_u[i].pushChild(c, bca);
71-
SDL_Log("Teste 1: inserir carta diretamente em PilhaUnica; R: %c", bca ? 's' : 'n');
72-
p_u[i].pushChild(c, bca);
73-
SDL_Log("Teste 2: inserur carta diretanebte en PilhaUnica; R: %c", bca?'s':'n');
74-
}
7568
p_u[i].setPosition({130 + 90 * i, 50});
7669
p_u[i].setTexture(gRenderer);
7770
event.addStack(&p_u[i]);
7871
}
7972

8073
PilhaDefinitiva p_d[4];
8174
for (int i = 0; i < 4; i++) {
82-
if (i == 0) {
83-
Carta c(1, gRenderer);
84-
p_d[i].pushChild(c, bca);
85-
SDL_Log("Teste 1: inserir carta diretamente em PilhaDefinitiva; R: %c", bca ? 's' : 'n');
86-
p_d[i].pushChild(c, bca);
87-
SDL_Log("Teste 2: inserur carta diretanebte en PilhaDefinitiva; R: %c", bca?'s':'n');
88-
}
8975
p_d[i].setPosition({560 + 90 * i, 50});
9076
p_d[i].setTexture(gRenderer);
9177
event.addStack(&p_d[i]);

0 commit comments

Comments
 (0)