From 405d4879d19cdccd9510bbf3e473ef0bc7ff7dfc Mon Sep 17 00:00:00 2001
From: Lennart Buhl <git@hackmate.de>
Date: Sat, 2 Nov 2013 19:58:17 +0100
Subject: [PATCH 1/2] add ncurses to makefile

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a60e1f5..5f67eb5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@
 CFLAGS=-g -Wall -Wextra -std=gnu99 
 BIN=bin
 SRC=src
+LIBS=-lncurses
 TARGET=$(BIN)/netsl
 OBJECTS=$(BIN)/main.o $(BIN)/msg.o $(BIN)/net.o $(BIN)/display.o
 
@@ -11,7 +12,7 @@ $(BIN):
 	mkdir -pv $(BIN)
 
 $(TARGET): $(OBJECTS)
-	gcc $^ -o $(TARGET)
+	gcc $^ $(LIBS) -o $(TARGET)
 
 #	mkdir -pv $(BIN)
 

From 2b054a8d87d5dee2d538c93928c4b081086dfc3d Mon Sep 17 00:00:00 2001
From: Lennart Buhl <git@hackmate.de>
Date: Sat, 2 Nov 2013 19:58:39 +0100
Subject: [PATCH 2/2] fix more bugs ^^

---
 src/display.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/display.c b/src/display.c
index b2430b9..95af3a6 100644
--- a/src/display.c
+++ b/src/display.c
@@ -3,9 +3,9 @@
 #include <string.h>
 #include <ncurses.h>
 
+#include "msg.h"
 #include "display.h"
 
-<<<<<<< HEAD
 
 void setup_display() {
 	initscr();   // ncurses initialization
@@ -23,11 +23,11 @@ void cleanup_display() {
 	uint32_t height;	// normally 25, may vary
 	char *image;		// dimension is width x height
 */
-void print_current_image(message* msg, int start, int end) {
+void print_current_image(struct message* msg, int start, int end) {
 	// end is ignored and 80 is used, should be considered later
 
 	move(0,0); // start in the upper left corner
-	char *pic = msg->img; // get a ptr to the actual image
+	char *pic = msg->image; // get a ptr to the actual image
 	
 	for (int row=0; row < 25; row++) { // iterate rows
 		char *line = (char*) malloc(81);