Remove junk

This commit is contained in:
CTurt 2014-12-09 18:33:24 +00:00
parent 632c42f494
commit 81a972020c
5 changed files with 0 additions and 23 deletions

View file

@ -37,7 +37,6 @@ struct packet {
extern int sock; extern int sock;
extern struct sockaddr_in sain, saout; extern struct sockaddr_in sain, saout;
//extern char outBuf[sizeof(struct packet)], rcvBuf[sizeof(struct packet)];
extern struct packet outBuf, rcvBuf; extern struct packet outBuf, rcvBuf;
bool openSocket(int port); bool openSocket(int port);

View file

@ -2,7 +2,6 @@
int sock; int sock;
struct sockaddr_in sain, saout; struct sockaddr_in sain, saout;
//char outBuf[sizeof(struct packet)], rcvBuf[sizeof(struct packet)];
struct packet outBuf, rcvBuf; struct packet outBuf, rcvBuf;
bool openSocket(int port) { bool openSocket(int port) {
@ -29,20 +28,8 @@ void sendConnectionRequest(void) {
} }
void sendKeys(unsigned int keys, circlePosition circlePad, touchPosition touch) { void sendKeys(unsigned int keys, circlePosition circlePad, touchPosition touch) {
//outBuf[0] = KEYS;
outBuf.command = KEYS; outBuf.command = KEYS;
//memcpy(outBuf + 1, &keys, 4);
//memcpy(outBuf + 5, &cstick, 4);
//#pragma GCC diagnostic push
//#pragma GCC diagnostic ignored "-Wstrict-aliasing"
//memcpy(&((struct packet *)outBuf)->keys, &keys, 4);
//memcpy(&((struct packet *)outBuf)->cstick, &cstick, 4);
//memcpy(&((struct packet *)outBuf)->touch, &touch, 4);
//sendBuf(sizeof(struct packet));
//#pragma GCC diagnostic pop
memcpy(&outBuf.keys, &keys, 4); memcpy(&outBuf.keys, &keys, 4);
memcpy(&outBuf.circlePad, &circlePad, 4); memcpy(&outBuf.circlePad, &circlePad, 4);
memcpy(&outBuf.touch, &touch, 4); memcpy(&outBuf.touch, &touch, 4);

View file

@ -38,7 +38,6 @@ extern struct sockaddr_in client_in;
extern int sockaddr_in_sizePtr; extern int sockaddr_in_sizePtr;
//extern char buffer[sizeof(struct packet)];
extern struct packet buffer; extern struct packet buffer;
extern char hostName[80]; extern char hostName[80];

View file

@ -88,17 +88,10 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmd, int nShow)
lastKeys = currentKeys; lastKeys = currentKeys;
if(currentKeys & KEY_TOUCH) lastTouch = currentTouch; if(currentKeys & KEY_TOUCH) lastTouch = currentTouch;
//#pragma GCC diagnostic push
//#pragma GCC diagnostic ignored "-Wstrict-aliasing"
//memcpy(&currentKeys, &((struct packet *)buffer)->keys, 4);
//memcpy(&circlePad, &((struct packet *)buffer)->circlePad, 4);
//memcpy(&currentTouch, &((struct packet *)buffer)->touch, 4);
//#pragma GCC diagnostic pop
memcpy(&currentKeys, &buffer.keys, 4); memcpy(&currentKeys, &buffer.keys, 4);
memcpy(&circlePad, &buffer.circlePad, 4); memcpy(&circlePad, &buffer.circlePad, 4);
memcpy(&currentTouch, &buffer.touch, 4); memcpy(&currentTouch, &buffer.touch, 4);
handleKey(KEY_A, settings.A); handleKey(KEY_A, settings.A);
handleKey(KEY_B, settings.B); handleKey(KEY_B, settings.B);
handleKey(KEY_SELECT, settings.Select); handleKey(KEY_SELECT, settings.Select);

View file

@ -9,7 +9,6 @@ struct sockaddr_in client_in;
int sockaddr_in_sizePtr = (int)sizeof(struct sockaddr_in); int sockaddr_in_sizePtr = (int)sizeof(struct sockaddr_in);
//char buffer[sizeof(struct packet)];
struct packet buffer; struct packet buffer;
char hostName[80]; char hostName[80];