Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean-up curses stuff, similar to CWC's solution, but without additional file #52

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Clean-up curses stuff, similar to CWC's solution, but without additional file #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ else
LDFLAGS = -lncurses
endif

ifeq ($(OS), Cygwin)
CFLAGS += -DNCURSES
endif

SOURCES = $(wildcard *.cpp)
_OBJS = $(SOURCES:.cpp=.o)
OBJS = $(patsubst %,$(ODIR)/%,$(_OBJS))
Expand Down
14 changes: 14 additions & 0 deletions catacurse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
#ifndef __CATACURSE__
#define __CATACURSE__

#if !defined(_WIN32) && !defined(WINDOWS)

#if defined(NCURSES)
#include <ncurses/curses.h>
#else
#include <curses.h>
#endif

#else

#define _WIN32_WINNT 0x0500
#define WIN32_LEAN_AND_MEAN
//#define VC_EXTRALEAN
Expand Down Expand Up @@ -149,4 +160,7 @@ bool WinCreate(bool initgl);
void CheckMessages();
int FindWin(WINDOW *wnd);
LRESULT CALLBACK ProcessMessages(HWND__ *hWnd,u_int32_t Msg,WPARAM wParam, LPARAM lParam);

#endif // windows ifdef block

#endif
6 changes: 1 addition & 5 deletions color.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
#ifndef _COLOR_H_
#define _COLOR_H

#if (defined _WIN32 || defined WINDOWS)
#include "catacurse.h"
#else
#include <curses.h>
#endif
#include "catacurse.h"

#ifndef _COLOR_LIST_
#define _COLOR_LIST_
Expand Down
6 changes: 1 addition & 5 deletions item.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@
#include "game.h"
#include <sstream>

#if (defined _WIN32 || defined WINDOWS)
#include "catacurse.h"
#else
#include <curses.h>
#endif
#include "catacurse.h"

bool is_flammable(material m);

Expand Down
6 changes: 1 addition & 5 deletions keypress.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
#ifndef _KEYPRESS_H_
#define _KEYPRESS_H_
#if (defined _WIN32 || defined WINDOWS)
#include "catacurse.h"
#else
#include <curses.h>
#endif

#include "catacurse.h"
#include <string>

class game;
Expand Down
7 changes: 1 addition & 6 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@
* Who knows
*/

#if (defined _WIN32 || defined WINDOWS)
#include "catacurse.h"
#else
#include <curses.h>
#endif

#include "catacurse.h"
#include <ctime>
#include "game.h"
#include "color.h"
Expand Down
6 changes: 1 addition & 5 deletions map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
#ifndef _MAP_H_
#define _MAP_H_

#if (defined _WIN32 || defined WINDOWS)
#include "catacurse.h"
#else
#include <curses.h>
#endif
#include "catacurse.h"

#include <stdlib.h>
#include <vector>
Expand Down
6 changes: 1 addition & 5 deletions melee.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@
#include <sstream>
#include <stdlib.h>

#if (defined _WIN32 || defined WINDOWS)
#include "catacurse.h"
#else
#include <curses.h>
#endif
#include "catacurse.h"

void hit_message(game *g, std::string subject, std::string verb,
std::string target, int dam, bool crit);
Expand Down
6 changes: 1 addition & 5 deletions monmove.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@
#include "pldata.h"
#include <stdlib.h>

#if (defined _WIN32 || defined WINDOWS)
#include "catacurse.h"
#else
#include <curses.h>
#endif
#include "catacurse.h"

#ifndef SGN
#define SGN(a) (((a)<0) ? -1 : 1)
Expand Down
6 changes: 1 addition & 5 deletions monster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@
#include <fstream>
#include <stdlib.h>

#if (defined _WIN32 || defined WINDOWS)
#include "catacurse.h"
#else
#include <curses.h>
#endif
#include "catacurse.h"

#define SGN(a) (((a)<0) ? -1 : 1)
#define SQR(a) ((a)*(a))
Expand Down
7 changes: 1 addition & 6 deletions output.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@

#if (defined _WIN32 || defined WINDOWS)
#include "catacurse.h"
#else
#include <curses.h>
#endif
#include "catacurse.h"

#include <string>
#include <vector>
Expand Down
6 changes: 1 addition & 5 deletions overmap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
#if (defined _WIN32 || defined WINDOWS)
#include "catacurse.h"
#else
#include <curses.h>
#endif
#include "catacurse.h"

#include <stdlib.h>
#include <time.h>
Expand Down
6 changes: 1 addition & 5 deletions overmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@
#include "output.h"
#include <vector>

#if (defined _WIN32 || defined WINDOWS)
#include "catacurse.h"
#else
#include <curses.h>
#endif
#include "catacurse.h"


class npc;
Expand Down
6 changes: 1 addition & 5 deletions player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@
#include <sstream>
#include <stdlib.h>

#if (defined _WIN32 || defined WINDOWS)
#include "catacurse.h"
#else
#include <curses.h>
#endif
#include "catacurse.h"

nc_color encumb_color(int level);
bool activity_is_suspendable(activity_type type);
Expand Down
7 changes: 2 additions & 5 deletions vehicle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@
#include "item.h"
#include <sstream>
#include <stdlib.h>
#if (defined _WIN32 || defined WINDOWS)
#include "catacurse.h"
#else
#include <curses.h>
#endif

#include "catacurse.h"

vehicle::vehicle(game *ag, vhtype_id type_id): g(ag), type(type_id)
{
Expand Down