summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Qureshi <stqism@Risingstormgames.com>2013-08-03 04:07:59 -0700
committerSean Qureshi <stqism@Risingstormgames.com>2013-08-03 04:07:59 -0700
commit0e4baac0f14b0c4c7c32d70386d64307875fb6ab (patch)
tree4257e221c3dc3f53d4152d12eb924095990dd81b
parent9e2eed644e2bade31cc8acdf0daaa98fe3df0c80 (diff)
parent6cfdf68940127b74da331a7b5465dfdcedc055db (diff)
Merge pull request #2 from stqism/master
Adds fixes from master in testing
-rw-r--r--testing/toxic/chat.c6
-rw-r--r--testing/toxic/prompt.c1
2 files changed, 4 insertions, 3 deletions
diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c
index 0e14a295..b835cf2d 100644
--- a/testing/toxic/chat.c
+++ b/testing/toxic/chat.c
@@ -63,8 +63,6 @@ static void chat_onMessage(ToxWindow* self, int num, uint8_t* msg, uint16_t len)
63 wprintw(ctx->history,"%s",hour); 63 wprintw(ctx->history,"%s",hour);
64 wprintw(ctx->history,":%s ",min); 64 wprintw(ctx->history,":%s ",min);
65 wattron(ctx->history, COLOR_PAIR(4)); 65 wattron(ctx->history, COLOR_PAIR(4));
66 wprintw(ctx->history, "%s: ", now);
67 wattron(ctx->history, COLOR_PAIR(4));
68 wprintw(ctx->history, "%s: ", nick); 66 wprintw(ctx->history, "%s: ", nick);
69 wattroff(ctx->history, COLOR_PAIR(4)); 67 wattroff(ctx->history, COLOR_PAIR(4));
70 wprintw(ctx->history, "%s\n", msg); 68 wprintw(ctx->history, "%s\n", msg);
@@ -109,17 +107,19 @@ static void chat_onKey(ToxWindow* self, int key) {
109 } 107 }
110 else if(key == '\n') { 108 else if(key == '\n') {
111 109
110 printf("Get times to int");
112 int inthour = timeinfo->tm_hour; //Pretty bad, but it gets the job done 111 int inthour = timeinfo->tm_hour; //Pretty bad, but it gets the job done
113 int intmin = timeinfo->tm_min; 112 int intmin = timeinfo->tm_min;
114 char min[2]; 113 char min[2];
115 char hour[2]; 114 char hour[2];
115 printf("Turn to varible");
116 sprintf(hour,"%d",inthour); 116 sprintf(hour,"%d",inthour);
117 if (intmin < 10) { 117 if (intmin < 10) {
118 sprintf(min,"0%d",intmin); 118 sprintf(min,"0%d",intmin);
119 } else { 119 } else {
120 sprintf(min,"%d",intmin); 120 sprintf(min,"%d",intmin);
121 } 121 }
122 122 printf("Display");
123 wattron(ctx->history, COLOR_PAIR(2)); 123 wattron(ctx->history, COLOR_PAIR(2));
124 wprintw(ctx->history,"%s",hour); 124 wprintw(ctx->history,"%s",hour);
125 wprintw(ctx->history,":%s ",min); 125 wprintw(ctx->history,":%s ",min);
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index e71f5f06..e80bdab0 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -140,6 +140,7 @@ static void execute(ToxWindow* self, char* cmd) {
140 break; 140 break;
141 case -2: 141 case -2:
142 wprintw(self->window, "Please add a message to your request.\n"); 142 wprintw(self->window, "Please add a message to your request.\n");
143 break;
143 case -3: 144 case -3:
144 break; 145 break;
145 wprintw(self->window, "That appears to be your own ID.\n"); 146 wprintw(self->window, "That appears to be your own ID.\n");