Skip to content

Commit

Permalink
update Files
Browse files Browse the repository at this point in the history
  • Loading branch information
rebeccabas committed Aug 10, 2023
1 parent ef93cfd commit bc16fba
Show file tree
Hide file tree
Showing 182 changed files with 3,145 additions and 0 deletions.
36 changes: 36 additions & 0 deletions Bonus.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#include "Bonus.h"

Bonus::Bonus(sf::Vector2f startingPosition)
{
file = "bonus.png";

try
{
if (!texture.loadFromFile("assets/" + file))/*, sf::IntRect(0, 0, Height, Width))*/
{
throw - 1;
}
}
catch (int)
{
std::cout << "Error: Cannot load bonus texture.";
exit(1);
}

sprite.setTexture(texture);
this->startingPosition = startingPosition;
sprite.setPosition(startingPosition);

Height = 32;
Width = 32;
Velocity = 0.1;
velocity = { Velocity ,2 * Velocity };
sprite.setOrigin(Width / 2.f, Height / 2.f);

isFriendly = true;
}


Bonus::~Bonus()
{
}
20 changes: 20 additions & 0 deletions Bonus.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#pragma once

#pragma once
#include<SFML/Graphics.hpp>
#include<SFML/Window.hpp>
#include<SFML/Audio.hpp>
#include<iostream>
#include"entity.h"

using namespace sf;
class Bonus : public Entity
{
private:

public:
Bonus() {};
Bonus(sf::Vector2f startingPosition);
~Bonus();

};
Binary file added Debug/Bonus.obj
Binary file not shown.
Binary file added Debug/Game.obj
Binary file not shown.
Binary file added Debug/GameInfo.obj
Binary file not shown.
3 changes: 3 additions & 0 deletions Debug/Mario.Build.CppClean.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
d:\programs\vs 2019\projects\timber\debug\vc143.idb
d:\programs\vs 2019\projects\timber\debug\vc143.pdb
d:\programs\vs 2019\projects\timber\debug\mario.tlog\cl.command.1.tlog
Binary file added Debug/Mario.exe
Binary file not shown.
11 changes: 11 additions & 0 deletions Debug/Mario.exe.recipe
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ProjectOutputs>
<ProjectOutput>
<FullPath>C:\Super-mario\Debug\Mario.exe</FullPath>
</ProjectOutput>
</ProjectOutputs>
<ContentFiles />
<SatelliteDlls />
<NonRecipeFileRefs />
</Project>
Binary file added Debug/Mario.ilk
Binary file not shown.
Binary file added Debug/Mario.obj
Binary file not shown.
Binary file added Debug/Mario.pdb
Binary file not shown.
Binary file added Debug/Mario.tlog/CL.command.1.tlog
Binary file not shown.
Binary file added Debug/Mario.tlog/CL.read.1.tlog
Binary file not shown.
Binary file added Debug/Mario.tlog/CL.write.1.tlog
Binary file not shown.
12 changes: 12 additions & 0 deletions Debug/Mario.tlog/Cl.items.tlog
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
C:\Super-mario\Bonus.cpp;C:\Super-mario\Debug\Bonus.obj
C:\Super-mario\entity.cpp;C:\Super-mario\Debug\entity.obj
C:\Super-mario\flyTur.cpp;C:\Super-mario\Debug\flyTur.obj
C:\Super-mario\Game.cpp;C:\Super-mario\Debug\Game.obj
C:\Super-mario\GameInfo.cpp;C:\Super-mario\Debug\GameInfo.obj
C:\Super-mario\main.cpp;C:\Super-mario\Debug\main.obj
C:\Super-mario\Mario.cpp;C:\Super-mario\Debug\Mario.obj
C:\Super-mario\Menu.cpp;C:\Super-mario\Debug\Menu.obj
C:\Super-mario\Screenshot.cpp;C:\Super-mario\Debug\Screenshot.obj
C:\Super-mario\Spikey.cpp;C:\Super-mario\Debug\Spikey.obj
C:\Super-mario\tileMap.cpp;C:\Super-mario\Debug\tileMap.obj
C:\Super-mario\Turtle.cpp;C:\Super-mario\Debug\Turtle.obj
2 changes: 2 additions & 0 deletions Debug/Mario.tlog/Mario.lastbuildstate
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.36.32532:TargetPlatformVersion=10.0.22000.0:
Debug|Win32|C:\Super-mario\|
Binary file added Debug/Mario.tlog/link.command.1.tlog
Binary file not shown.
Binary file added Debug/Mario.tlog/link.read.1.tlog
Binary file not shown.
Binary file added Debug/Mario.tlog/link.write.1.tlog
Binary file not shown.
Binary file added Debug/Menu.obj
Binary file not shown.
Binary file added Debug/Screenshot.obj
Binary file not shown.
Binary file added Debug/Spikey.obj
Binary file not shown.
259 changes: 259 additions & 0 deletions Debug/Timber.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,259 @@
 Bonus.cpp
C:\Super-mario\Bonus.cpp(26,13): warning C4305: '=': truncation from 'double' to 'float'
entity.cpp
C:\Super-mario\entity.cpp(66,72): warning C4244: 'argument': conversion from 'float' to 'T', possible loss of data
with
[
T=int
]
C:\Super-mario\entity.cpp(66,64): warning C4244: 'argument': conversion from 'float' to 'T', possible loss of data
with
[
T=int
]
flyTur.cpp
C:\Super-mario\flyTur.cpp(26,13): warning C4305: '=': truncation from 'double' to 'float'
Game.cpp
C:\Super-mario\Game.h(22,1): warning C4005: 'TOP': macro redefinition
C:\Super-mario\tileMap.h(18,1): message : see previous definition of 'TOP'
C:\Super-mario\Game.h(23,1): warning C4005: 'BOTTOM': macro redefinition
C:\Super-mario\tileMap.h(17,1): message : see previous definition of 'BOTTOM'
C:\Super-mario\Game.cpp(93,20): warning C4018: '<': signed/unsigned mismatch
C:\Super-mario\Game.cpp(150,39): warning C4244: 'argument': conversion from 'const T' to 'int', possible loss of data
with
[
T=float
]
C:\Super-mario\Game.cpp(151,38): warning C4244: 'argument': conversion from 'T' to 'int', possible loss of data
with
[
T=float
]
C:\Super-mario\Game.cpp(153,41): warning C4244: 'argument': conversion from 'const T' to 'int', possible loss of data
with
[
T=float
]
C:\Super-mario\Game.cpp(243,25): warning C4244: 'argument': conversion from 'const T' to 'int', possible loss of data
with
[
T=float
]
C:\Super-mario\Game.cpp(264,20): warning C4018: '<': signed/unsigned mismatch
C:\Super-mario\Game.cpp(272,20): warning C4018: '<': signed/unsigned mismatch
C:\Super-mario\Game.cpp(317,12): warning C4244: '=': conversion from 'double' to 'float', possible loss of data
C:\Super-mario\Game.cpp(318,12): warning C4244: '=': conversion from 'double' to 'float', possible loss of data
GameInfo.cpp
C:\Super-mario\GameInfo.cpp(53,42): warning C4244: 'argument': conversion from 'int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\GameInfo.cpp(54,42): warning C4244: 'argument': conversion from 'int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\GameInfo.cpp(55,42): warning C4244: 'argument': conversion from 'int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\GameInfo.cpp(56,42): warning C4244: 'argument': conversion from 'int' to 'T', possible loss of data
with
[
T=float
]
main.cpp
C:\Super-mario\Game.h(22,1): warning C4005: 'TOP': macro redefinition
C:\Super-mario\tileMap.h(18,1): message : see previous definition of 'TOP'
C:\Super-mario\Game.h(23,1): warning C4005: 'BOTTOM': macro redefinition
C:\Super-mario\tileMap.h(17,1): message : see previous definition of 'BOTTOM'
Mario.cpp
C:\Super-mario\Mario.cpp(28,13): warning C4305: '=': truncation from 'double' to 'float'
C:\Super-mario\Mario.cpp(58,26): warning C4244: '=': conversion from 'double' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\Mario.cpp(63,16): warning C4305: '=': truncation from 'double' to 'T'
with
[
T=float
]
C:\Super-mario\Mario.cpp(93,19): warning C4305: 'argument': truncation from 'double' to 'float'
C:\Super-mario\Mario.cpp(94,15): warning C4305: '*=': truncation from 'double' to 'float'
C:\Super-mario\Mario.cpp(125,46): warning C4244: 'return': conversion from 'sf::Int32' to 'float', possible loss of data
Menu.cpp
C:\Super-mario\Menu.cpp(45,42): warning C4244: 'argument': conversion from 'int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\Menu.cpp(46,96): warning C4305: 'argument': truncation from 'double' to 'T'
with
[
T=float
]
C:\Super-mario\Menu.cpp(46,42): warning C4244: 'argument': conversion from 'int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\Menu.cpp(47,42): warning C4244: 'argument': conversion from 'int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\Menu.cpp(48,96): warning C4305: 'argument': truncation from 'double' to 'T'
with
[
T=float
]
C:\Super-mario\Menu.cpp(48,42): warning C4244: 'argument': conversion from 'int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\Menu.cpp(50,54): warning C4244: 'argument': conversion from 'int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\Menu.cpp(51,54): warning C4244: 'argument': conversion from 'int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\Menu.cpp(52,54): warning C4244: 'argument': conversion from 'int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\Menu.cpp(225,22): warning C4018: '<': signed/unsigned mismatch
Screenshot.cpp
Spikey.cpp
C:\Super-mario\Spikey.cpp(25,13): warning C4305: '=': truncation from 'double' to 'float'
tileMap.cpp
C:\Super-mario\tileMap.cpp(49,54): warning C4244: 'argument': conversion from 'unsigned int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\tileMap.cpp(49,38): warning C4244: 'argument': conversion from 'unsigned int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\tileMap.cpp(50,60): warning C4244: 'argument': conversion from 'unsigned int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\tileMap.cpp(50,44): warning C4244: 'argument': conversion from 'unsigned int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\tileMap.cpp(51,66): warning C4244: 'argument': conversion from 'unsigned int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\tileMap.cpp(51,44): warning C4244: 'argument': conversion from 'unsigned int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\tileMap.cpp(52,60): warning C4244: 'argument': conversion from 'unsigned int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\tileMap.cpp(52,38): warning C4244: 'argument': conversion from 'unsigned int' to 'T', possible loss of data
with
[
T=float
]
C:\Super-mario\tileMap.cpp(55,57): warning C4244: 'argument': conversion from 'T' to 'T', possible loss of data
with
[
T=unsigned int
]
and
[
T=float
]
C:\Super-mario\tileMap.cpp(55,40): warning C4244: 'argument': conversion from 'T' to 'T', possible loss of data
with
[
T=unsigned int
]
and
[
T=float
]
C:\Super-mario\tileMap.cpp(56,63): warning C4244: 'argument': conversion from 'T' to 'T', possible loss of data
with
[
T=unsigned int
]
and
[
T=float
]
C:\Super-mario\tileMap.cpp(56,46): warning C4244: 'argument': conversion from 'T' to 'T', possible loss of data
with
[
T=unsigned int
]
and
[
T=float
]
C:\Super-mario\tileMap.cpp(57,69): warning C4244: 'argument': conversion from 'T' to 'T', possible loss of data
with
[
T=unsigned int
]
and
[
T=float
]
C:\Super-mario\tileMap.cpp(57,46): warning C4244: 'argument': conversion from 'T' to 'T', possible loss of data
with
[
T=unsigned int
]
and
[
T=float
]
C:\Super-mario\tileMap.cpp(58,63): warning C4244: 'argument': conversion from 'T' to 'T', possible loss of data
with
[
T=unsigned int
]
and
[
T=float
]
C:\Super-mario\tileMap.cpp(58,40): warning C4244: 'argument': conversion from 'T' to 'T', possible loss of data
with
[
T=unsigned int
]
and
[
T=float
]
C:\Super-mario\tileMap.cpp(73,30): warning C4244: '=': conversion from 'unsigned int' to 'float', possible loss of data
C:\Super-mario\tileMap.cpp(74,14): warning C4244: '=': conversion from 'unsigned int' to 'float', possible loss of data
C:\Super-mario\tileMap.cpp(75,15): warning C4244: '=': conversion from 'unsigned int' to 'float', possible loss of data
C:\Super-mario\tileMap.cpp(76,29): warning C4244: '=': conversion from 'unsigned int' to 'float', possible loss of data
C:\Super-mario\tileMap.cpp(84,20): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
C:\Super-mario\tileMap.cpp(144,9): warning C4244: 'return': conversion from 'int' to 'float', possible loss of data
C:\Super-mario\tileMap.cpp(179,21): warning C4018: '<': signed/unsigned mismatch
Turtle.cpp
Generating Code...
Timber.vcxproj -> C:\Super-mario\Debug\Mario.exe
2 changes: 2 additions & 0 deletions Debug/Timber.vcxproj.FileListAbsolute.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
C:\Mario\Debug\Mario.exe
C:\Super-mario\Debug\Mario.exe
Binary file added Debug/Turtle.obj
Binary file not shown.
Binary file added Debug/entity.obj
Binary file not shown.
Binary file added Debug/flyTur.obj
Binary file not shown.
Binary file added Debug/main.obj
Binary file not shown.
Binary file added Debug/tileMap.obj
Binary file not shown.
Binary file added Debug/vc143.idb
Binary file not shown.
Binary file added Debug/vc143.pdb
Binary file not shown.
Loading

0 comments on commit bc16fba

Please sign in to comment.