Project

General

Profile

Revision 179

changed stuff

View differences:

proj.c
2 2
#include <lcom/proj.h>
3 3
#include <lcom/liblm.h>
4 4

  
5
#include <stdbool.h>
6
#include <stdint.h>
7

  
8
#include "i8254.h"
9
#include "kbc_macros.h"
10
#include "graph_macros.h"
11
#include "mouse_macros.h"
12 5
#include "proj_macros.h"
13
#include "errors.h"
6
#include "proj_func.h"
14 7

  
15
#include "sprite.h"
16 8
#include "kbc.h"
17
#include "graph.h"
18 9
#include "timer.h"
19 10
#include "keyboard.h"
20 11
#include "mouse.h"
21
#include "utils.h"
22 12
#include "interrupts_func.h"
23
#include "proj_func.h"
24 13

  
25
#include "fast_math.h"
26
#include <math.h>
14
#include "graph.h"
15
#include "sprite.h"
16
#include "rectangle.h"
27 17

  
28 18
#ifdef DIOGO
29 19
    #include "shooter.h"
30
    #include "pistol.xpm"
31 20
#endif
32 21
#ifdef TELMO
33 22
    #include "crosshair.h"
......
78 67
        printf("Time taken: %d/%d \n", t, CLOCKS_PER_SEC);
79 68
        sprite_dtor(shooter1);
80 69
        */
70
        /*
71
        rectangle_t *rect = rectangle_ctor(100, 100, 100, 100);
72
        rectangle_set_fill_color   (rect, 0x0000FF);
73
        rectangle_set_outline_color(rect, 0xFF0000);
74
        rectangle_set_outline_width(rect, 0);
75
        rectangle_draw(rect);
76
        rectangle_set_pos(rect, 205, 100);
77
        rectangle_set_outline_width(rect, 1);
78
        rectangle_draw(rect);
79
        rectangle_set_pos(rect, 310, 100);
80
        rectangle_set_outline_width(rect, 2);
81
        rectangle_draw(rect);
82
        rectangle_set_pos(rect, 415, 100);
83
        rectangle_set_outline_width(rect, 3);
84
        rectangle_draw(rect);
85

  
86
        graph_draw();
87
        */
81 88
    #endif
82 89

  
83 90
    #ifdef TELMO
......
92 99
    message msg;
93 100
    int good = 1;
94 101

  
95
    #ifdef DIOGO
96
        good = 0;
97
    #endif
98

  
99 102
    while (good) {
100 103
        /* Get a request message. */
101 104
        if ((r = driver_receive(ANY, &msg, &ipc_status)) != 0) {

Also available in: Unified diff