Skip to content

Commit e55a666

Browse files
committed
first commit in new laptop
1 parent 4ef2aa0 commit e55a666

16 files changed

+25
-14
lines changed

OGLdpf.log

Whitespace-only changes.

Release/CL.read.1.tlog

1.12 KB
Binary file not shown.

Release/CL.write.1.tlog

-42 Bytes
Binary file not shown.

Release/cl.command.1.tlog

776 Bytes
Binary file not shown.

Release/link.command.1.tlog

1.45 KB
Binary file not shown.

Release/link.read.1.tlog

-12 Bytes
Binary file not shown.

Release/link.write.1.tlog

-42 Bytes
Binary file not shown.

Release/main.obj

863 Bytes
Binary file not shown.

Release/myProject4.lastbuildstate

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#v4.0:v110:false
2-
Release|Win32|D:\Димона\Универ\Прога\Projects\Game\myProject4\|
2+
Release|Win32|D:\Проекты\Visual Studio\Game\myProject4\|

Release/myProject4.log

+15-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1-
 main.cpp
2-
Создание кода
3-
Создание кода завершено
4-
myProject4.vcxproj -> D:\Димона\Универ\Прога\Projects\Game\myProject4\Release\myProject4.exe
1+
Построение начато 26.07.2017 13:59:25.
2+
1>Проект "D:\Проекты\Visual Studio\Game\myProject4\myProject4\myProject4.vcxproj" в узле 2 (целевые объекты Build).
3+
1>ClCompile:
4+
D:\Программы\Visual Studio 2012 Express\VC\bin\CL.exe /c /I"D:\Программы\Для программ\SFML-2.4.1\include" /Zi /nologo /W3 /WX- /sdl /O2 /Oi /Oy- /GL /D SFML_DYNAMIC /D _CRT_SECURE_NO_WARNINGS /D _MBCS /Gm- /EHsc /MD /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Release\\" /Fd"Release\vc110.pdb" /Gd /TP /analyze- /errorReport:prompt main.cpp
5+
main.cpp
6+
Link:
7+
D:\Программы\Visual Studio 2012 Express\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"D:\Проекты\Visual Studio\Game\myProject4\Release\myProject4.exe" /NOLOGO /LIBPATH:"D:\Программы\Для программ\SFML-2.4.1\lib" "sfml-graphics.lib" "sfml-window.lib" "sfml-system.lib" "sfml-audio.lib" kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /DEBUG /PDB:"D:\Проекты\Visual Studio\Game\myProject4\Release\myProject4.pdb" /OPT:REF /OPT:ICF /LTCG /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"D:\Проекты\Visual Studio\Game\myProject4\Release\myProject4.lib" /MACHINE:X86 /SAFESEH Release\main.obj
8+
Создание кода
9+
Создание кода завершено
10+
myProject4.vcxproj -> D:\Проекты\Visual Studio\Game\myProject4\Release\myProject4.exe
11+
1>Построение проекта "D:\Проекты\Visual Studio\Game\myProject4\myProject4\myProject4.vcxproj" завершено (целевые объекты Build).
12+
13+
Построение успешно завершено.
14+
15+
Затраченное время: 00:00:03.28

Release/vc110.pdb

24 KB
Binary file not shown.

Resources/Info/Player.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8 49.2857 99.2857 19911.5 27 28 29 1 0
1+
8 29.3103 50.8621 20027 27 28 29 1 0

Resources/LVLs/lvl5.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
8
2-
0 0
3-
12
2+
3 3
3+
14
44
0 0 Start
55
7 0 Finish
66
3 3 Save

general classes.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,16 +190,16 @@
190190
else if (Direction [currDirection] == 1) tmpY = y + EDGE; //çàïîìèíàåì êîîðäèíàòû êóäà ìû äîëæû ïðèäòè
191191
else if (Direction [currDirection] == 2) tmpX = x - EDGE; //çàïîìèíàåì êîîðäèíàòû êóäà ìû äîëæû ïðèäòè
192192
else if (Direction [currDirection] == 3) tmpX = x + EDGE; //çàïîìèíàåì êîîðäèíàòû êóäà ìû äîëæû ïðèäòè
193-
currDirection++; F_move = true;
193+
currDirection++; F_move = true; cout << "direction" << endl;
194194
xx = (float) x; yy = (float) y;
195195
}
196196

197-
198197
changeFigureKey ();
199198

200199
if (F_move){ //ïðîâåðÿåì, íåò ëè ñòåíû íà òîì ìåñòå êóäà ìû õîòèì ïåðåéòè
201200
if (abs (xx - (float) tmpX) < speed * time && abs (yy - (float) tmpY) < speed * time){ //ïî ðàçíîñòè ïîíèìàåì êîãäà èãðîê äîñòèã ñëåäóþùåé êëåòêè, îêðóãëÿåì êîîðäèíàòû è äàëüøå äâèæåìñÿ
202201
F_move = false;
202+
cout << "dima" << endl;
203203
xx = (float) tmpX; yy = (float) tmpY;
204204
x = tmpX; y = tmpY;
205205
}

main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1978,8 +1978,8 @@ int main (){
19781978

19791979

19801980
Game game;
1981-
system.window = new RenderWindow (VideoMode (system.W_WIN, system.H_WIN), "LABYRINTH PRO", Style::Fullscreen, ContextSettings (0, 0, 1)); //ñîçäàíèå îêíà
1982-
//system.window = new RenderWindow (VideoMode (system.W_WIN, system.H_WIN), "LABYRINTH PRO"); //ñîçäàíèå îêíà
1981+
//system.window = new RenderWindow (VideoMode (system.W_WIN, system.H_WIN), "LABYRINTH PRO", Style::Fullscreen, ContextSettings (0, 0, 1)); //ñîçäàíèå îêíà
1982+
system.window = new RenderWindow (VideoMode (system.W_WIN, system.H_WIN), "LABYRINTH PRO"); //ñîçäàíèå îêíà
19831983
system.window -> setMouseCursorVisible (false); //íå ðèñóåì êóðñîð
19841984
bool isUpdate = false;
19851985

myProject4.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@
6060
<FunctionLevelLinking>true</FunctionLevelLinking>
6161
<IntrinsicFunctions>true</IntrinsicFunctions>
6262
<SDLCheck>true</SDLCheck>
63-
<AdditionalIncludeDirectories>D:\SFML-2.4.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
63+
<AdditionalIncludeDirectories>D:\Программы\Для программ\SFML-2.4.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6464
<PreprocessorDefinitions>SFML_DYNAMIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6565
</ClCompile>
6666
<Link>
6767
<GenerateDebugInformation>true</GenerateDebugInformation>
6868
<EnableCOMDATFolding>true</EnableCOMDATFolding>
6969
<OptimizeReferences>true</OptimizeReferences>
70-
<AdditionalLibraryDirectories>D:\SFML-2.4.1\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
70+
<AdditionalLibraryDirectories>D:\Программы\Для программ\SFML-2.4.1\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
7171
<AdditionalDependencies>sfml-graphics.lib;sfml-window.lib;sfml-system.lib;sfml-audio.lib;%(AdditionalDependencies)</AdditionalDependencies>
7272
</Link>
7373
</ItemDefinitionGroup>

0 commit comments

Comments
 (0)