Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added icon #4

Merged
merged 1 commit into from
Aug 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added OutForDelivery/JayNakum.aps
Binary file not shown.
61 changes: 61 additions & 0 deletions OutForDelivery/JayNakum.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"

#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winres.h"

/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS

/////////////////////////////////////////////////////////////////////////////
// English (United States) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE 9, 1

#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//

1 TEXTINCLUDE
BEGIN
"resource.h\0"
END

2 TEXTINCLUDE
BEGIN
"#include ""winres.h""\r\n"
"\0"
END

3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END

#endif // APSTUDIO_INVOKED

#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////



#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//


/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

JayNakum ICON "logo.ico"
4 changes: 4 additions & 0 deletions OutForDelivery/OutForDelivery.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@
<ClCompile Include="src\engine\Window.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h" />
<ClInclude Include="src\House.h" />
<ClInclude Include="src\Cannon.h" />
<ClInclude Include="src\Ground.h" />
Expand Down Expand Up @@ -448,6 +449,9 @@
<None Include="vendors\glm\gtx\vector_query.inl" />
<None Include="vendors\glm\gtx\wrap.inl" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="JayNakum.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
8 changes: 8 additions & 0 deletions OutForDelivery/OutForDelivery.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,9 @@
<ClInclude Include="src\House.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="vendors\glm\detail\func_common.inl">
Expand Down Expand Up @@ -874,4 +877,9 @@
<None Include="res\shaders\3.3.shader.fs" />
<None Include="res\shaders\3.3.shader.vs" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="JayNakum.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
Binary file added OutForDelivery/logo.ico
Binary file not shown.
14 changes: 14 additions & 0 deletions OutForDelivery/resource.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by JayNakum.rc

// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
2 changes: 1 addition & 1 deletion OutForDelivery/src/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ void Application::run()
{
if (package.getPos() >= house.getPos() - 1.0f && package.getPos() <= house.getPos() + 1.0f)
{
house.reset((rand() % 10) + 1);
house.reset((rand() % 10) + 2);

}
package.reset();
Expand Down