Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:Eight-Minions/Eight-Minions

  • Loading branch information...
commit b46a04b6d42dedafc9b330de4412e665442a9d13 2 parents 9e04b32 + e229378
@Coderlane Coderlane authored
View
2  Eight Minions/Eight Minions.vcproj
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
View
34 Eight Minions/UpdMess.cpp
@@ -36,7 +36,7 @@ UpdMess::UpdMess(int p, int t, ...)
{
if(var < 10)
messText += '0';
- messText += itoa(var,buff,10);
+ messText += _itoa(var,buff,10);
}
if(var == TOWERATTACK)
{
@@ -54,7 +54,7 @@ UpdMess::UpdMess(int p, int t, ...)
{
if(var < 10)
messText += '0';
- messText += itoa(var,buff,10);
+ messText += _itoa(var,buff,10);
}
}
// i = 2 AttackedID[4]
@@ -68,7 +68,7 @@ UpdMess::UpdMess(int p, int t, ...)
{
messText += '0';
}
- messText += itoa(var,buff,10);
+ messText += _itoa(var,buff,10);
}
}
else
@@ -92,7 +92,7 @@ UpdMess::UpdMess(int p, int t, ...)
{
messText += '0';
}
- messText += itoa(var,buff,10);
+ messText += _itoa(var,buff,10);
}
}
// i = 1 X
@@ -105,7 +105,7 @@ UpdMess::UpdMess(int p, int t, ...)
{
if(var < 10)
messText += '0';
- messText += itoa(var,buff,10);
+ messText += _itoa(var,buff,10);
}
}
}
@@ -125,7 +125,7 @@ UpdMess::UpdMess(int p, int t, ...)
{
if(var < 10)
messText += '0';
- messText += itoa(var,buff,10);
+ messText += _itoa(var,buff,10);
}
}
}
@@ -146,7 +146,7 @@ UpdMess::UpdMess(int p, int t, ...)
{
messText += '0';
}
- messText += itoa(var,buff,10);
+ messText += _itoa(var,buff,10);
}
}
}
@@ -166,7 +166,7 @@ UpdMess::UpdMess(int p, int t, ...)
{
messText += '0';
}
- messText += itoa(var,buff,10);
+ messText += _itoa(var,buff,10);
}
}
else if(i == 1)
@@ -177,7 +177,7 @@ UpdMess::UpdMess(int p, int t, ...)
{
if(var < 10)
messText += '0';
- messText += itoa(var,buff,10);
+ messText += _itoa(var,buff,10);
}
}
}
@@ -197,7 +197,7 @@ UpdMess::UpdMess(int p, int t, ...)
{
messText += '0';
}
- messText += itoa(var,buff,10);
+ messText += _itoa(var,buff,10);
}
}
else if(i == 1)
@@ -206,7 +206,7 @@ UpdMess::UpdMess(int p, int t, ...)
messText += "0";
else
{
- messText += itoa(var,buff,10);
+ messText += _itoa(var,buff,10);
}
}
}
@@ -232,7 +232,7 @@ UpdMess::UpdMess(int p, int t, ...)
{
messText += '0';
}
- messText += itoa(var,buff,10);
+ messText += _itoa(var,buff,10);
}
}
@@ -249,7 +249,7 @@ UpdMess::UpdMess(int p, int t, ...)
{
messText += '0';
}
- messText += itoa(var,buff,10);
+ messText += _itoa(var,buff,10);
}
}
// Creep Type
@@ -260,7 +260,7 @@ UpdMess::UpdMess(int p, int t, ...)
{
if(var < 10)
messText += '0';
- messText += itoa(var,buff,10);
+ messText += _itoa(var,buff,10);
}
}
// Creep Level
@@ -274,7 +274,7 @@ UpdMess::UpdMess(int p, int t, ...)
{
messText += '0';
}
- messText += itoa(var,buff,10);
+ messText += _itoa(var,buff,10);
}
}
else
@@ -299,7 +299,7 @@ UpdMess::UpdMess(int p, int t, ...)
{
messText += '0';
}
- messText += itoa(var,buff,10);
+ messText += _itoa(var,buff,10);
}
}
// Money
@@ -313,7 +313,7 @@ UpdMess::UpdMess(int p, int t, ...)
{
messText += '0';
}
- messText += itoa(var,buff,10);
+ messText += _itoa(var,buff,10);
}
}
else
View
2  Eight Minions/button.cpp
@@ -37,7 +37,7 @@ bool Button::wasClicked( int clickX, int clickY )
bool Button::isClicked()
{
- return isPressed;
+ return (bool)isPressed;
}
View
8 Eight Minions/client.cpp
@@ -189,7 +189,7 @@ int client::testrun()
}
if(t_check)
{
-
+ //for(cListNode<creep*> *cur = )
}
}
}
@@ -298,7 +298,7 @@ coord client::getClickCoord(int x, int y)
void client::initButtons()
{
- buttons[0] = new Button("images/towerButton",652,60,80,120);
+ buttons[0] = new Button("images/towerButton",652,60,71,92);
}
@@ -308,11 +308,11 @@ void client::initText()
textRects[0] = newRect(10,10,0,0);
text[0] = TTF_RenderText_Solid( font, "Current Health: ", Cwhite);
textRects[1] = newRect(200,10,0,0);
- text[1] = TTF_RenderText_Solid( font, itoa(self->getHealth(),buff,10), Cwhite);
+ text[1] = TTF_RenderText_Solid( font, _itoa(self->getHealth(),buff,10), Cwhite);
textRects[2] = newRect(240,10,0,0);
text[2] = TTF_RenderText_Solid( font, "Money:", Cblack);
textRects[3] = newRect(325,10,0,0);
- text[3] = TTF_RenderText_Solid(font, itoa(self->getMoney(),buff,10), Cblack);
+ text[3] = TTF_RenderText_Solid(font, _itoa(self->getMoney(),buff,10), Cblack);
}
View
4 Eight Minions/client_net.cpp
@@ -160,8 +160,8 @@ int client::performUpdate(string upd)
self->setHealth(update.getVal(0));
self->setMoney(update.getVal(1));
char buff[8];
- text[1] = TTF_RenderText_Solid( font, itoa(self->getHealth(),buff,10), Cwhite);
- text[3] = TTF_RenderText_Solid(font, itoa(self->getMoney(),buff,10), Cblack);
+ text[1] = TTF_RenderText_Solid( font, _itoa(self->getHealth(),buff,10), Cwhite);
+ text[3] = TTF_RenderText_Solid(font, _itoa(self->getMoney(),buff,10), Cblack);
}
}
else
View
2  Eight Minions/creep.cpp
@@ -151,8 +151,6 @@ bool creep::move()
}
void creep::displayCreep(SDL_Surface *screen, SDL_Surface *image, SDL_Rect *spriteMap[ANIM_NUM])
{
- if(this->type == FATTY)
- cout << "weird...\n";
if(image != NULL)
{
updateAnim();
View
BIN  Eight Minions/images/towerButtonDown.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Eight Minions/images/towerButtonUp.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
1  Eight Minions/resources.h
@@ -17,6 +17,7 @@
#include "UpdMess.h"
#include "path.h"
+
#define TCP_NODELAY 1 // THIS LINE FIXES SLOWNESS!!!!
//Standard UpdMess Definitions
Please sign in to comment.
Something went wrong with that request. Please try again.